Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/sys/dev/pci Pull up 1.80 (approved by thorpej):



details:   https://anonhg.NetBSD.org/src/rev/337c20785933
branches:  netbsd-1-5
changeset: 488600:337c20785933
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Jul 20 14:25:47 2000 +0000

description:
Pull up 1.80 (approved by thorpej):
Make is compile when PCIIDE_AMD756_ENABLEDMA is defined; close PR kern/10555.

diffstat:

 sys/dev/pci/pciide.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 66bba6bc9713 -r 337c20785933 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Thu Jul 20 14:21:37 2000 +0000
+++ b/sys/dev/pci/pciide.c      Thu Jul 20 14:25:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.68.2.7 2000/07/19 12:29:25 bouyer Exp $   */
+/*     $NetBSD: pciide.c,v 1.68.2.8 2000/07/20 14:25:47 bouyer Exp $   */
 
 
 /*
@@ -1781,8 +1781,10 @@
        struct ata_drive_datas *drvp;
        struct pciide_channel *cp = (struct pciide_channel*)chp;
        struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc;
+#ifndef PCIIDE_AMD756_ENABLEDMA
        int rev = PCI_REVISION(
            pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_CLASS_REG));
+#endif
 
        idedma_ctl = 0;
        datatim_reg = pci_conf_read(sc->sc_pc, sc->sc_tag, AMD756_DATATIM);



Home | Main Index | Thread Index | Old Index