diff options
| author | garbled <garbled@NetBSD.org> | 2007-04-26 19:47:03 +0000 |
|---|---|---|
| committer | garbled <garbled@NetBSD.org> | 2007-04-26 19:47:03 +0000 |
| commit | 3dc01edf8264fac0837c8771bef0c4e829c321f9 (patch) | |
| tree | f8cbdcc580a1eca9d1387e0a2043f12b6d3f6b39 /sys | |
| parent | ca2a9952cab71bc09a2a55a2f75475dd5c891dd6 (diff) | |
Remove the PCIIDE_SLIDE_SETIRQA hack. Recent revalations have uncovered
the fact that it's useless.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/files.pci | 3 | ||||
| -rw-r--r-- | sys/dev/pci/slide.c | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index cfed4f6e0d7..a8b6771a2a3 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.285 2007/04/11 04:48:31 macallan Exp $ +# $NetBSD: files.pci,v 1.286 2007/04/26 19:47:03 garbled Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -14,7 +14,6 @@ defparam opt_bktr.h BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX defflag opt_pciide.h PCIIDE_CMD064x_DISABLE PCIIDE_AMD756_ENABLEDMA PCIIDE_CMD0646U_ENABLEUDMA PCIIDE_I31244_DISABLEDMA - PCIIDE_SLIDE_SETIRQA device pci {[dev = -1], [function = -1]} attach pci at pcibus diff --git a/sys/dev/pci/slide.c b/sys/dev/pci/slide.c index 46435dd4e25..0fe57cd21d6 100644 --- a/sys/dev/pci/slide.c +++ b/sys/dev/pci/slide.c @@ -1,4 +1,4 @@ -/* $NetBSD: slide.c,v 1.17 2007/03/20 05:50:35 garbled Exp $ */ +/* $NetBSD: slide.c,v 1.18 2007/04/26 19:47:04 garbled Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.17 2007/03/20 05:50:35 garbled Exp $"); +__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.18 2007/04/26 19:47:04 garbled Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -168,10 +168,6 @@ sl82c105_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) sc->sc_wdcdev.sc_atac.atac_nchannels = PCIIDE_NUM_CHANNELS; idecr = pci_conf_read(sc->sc_pc, sc->sc_tag, SYMPH_IDECSR); -#ifdef PCIIDE_SLIDE_SETIRQA - idecr |= IDECR_IDE_IRQA; - pci_conf_write(sc->sc_pc, sc->sc_tag, SYMPH_IDECSR, idecr); -#endif interface = PCI_INTERFACE(pa->pa_class); |
