summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-07-13 16:25:37 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-07-13 16:25:37 +0000
commit269b2e7d97a268a0c392a85d7533cbe23efb8da5 (patch)
tree16629474a0f536308c20997801ec93b187b3dd4c /sys
parent8ef33bae0f96f0dc240e4f1a003da2d8232658f8 (diff)
pci_intr_establish() is a macros on some archs and ifdef w/in the macro args does not work
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/bktr/bktr_os.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 0a2739924fc..51476824d76 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_os.c,v 1.12 2002/06/06 20:57:47 aaron Exp $ */
+/* $OpenBSD: bktr_os.c,v 1.13 2002/07/13 16:25:36 mickey Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
/*
@@ -1423,12 +1423,13 @@ bktr_attach(struct device *parent, struct device *self, void *aux)
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih);
- bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO,
- bktr_intr, bktr
#ifdef __OpenBSD__
- , bktr->bktr_dev.dv_xname
+ bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO,
+ bktr_intr, bktr, bktr->bktr_dev.dv_xname);
+#else
+ bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO,
+ bktr_intr, bktr);
#endif
- );
if (bktr->ih == NULL) {
printf("%s: couldn't establish interrupt",
bktr_name(bktr));