summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-08-05 00:10:32 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-08-05 00:10:32 +0000
commit62a3e8614928df4d912b63ccfb337bb715e1dcd3 (patch)
tree6bccfbd234e91918c5d6512ce5740a0e6944a3ac /sys/dev
parent3e3404caea4c045c15b3be51b3d3cea5ea26e26e (diff)
It is not ok to do #ifdef processing inside argument lists of calls, where
it is feasible the function is really a macro, like pci_intr_establish is on alpha.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pciide.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index a7e1743ec5f..64d1222a6ac 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.7 1999/08/04 23:27:49 niklas Exp $ */
+/* $OpenBSD: pciide.c,v 1.8 1999/08/05 00:10:31 niklas Exp $ */
/* $NetBSD: pciide.c,v 1.40 1999/07/12 13:49:38 bouyer Exp $ */
/*
@@ -656,12 +656,14 @@ pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep)
return 0;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle);
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
- intrhandle, IPL_BIO, pciide_pci_intr, sc
#ifdef __OpenBSD__
- , sc->sc_wdcdev.sc_dev.dv_xname
+ sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
+ intrhandle, IPL_BIO, pciide_pci_intr, sc,
+ sc->sc_wdcdev.sc_dev.dv_xname);
+#else
+ sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
+ intrhandle, IPL_BIO, pciide_pci_intr, sc);
#endif
- );
if (sc->sc_pci_ih != NULL) {
printf("%s: using %s for native-PCI interrupt\n",
sc->sc_wdcdev.sc_dev.dv_xname,