summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-05-10 00:07:41 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-05-10 00:07:41 +0000
commitd67be1537f391d354ce3dcaf3881d6b117d40e36 (patch)
treedbe21ddc2417d700897899263db74dd182d11fbb
parentdff71b369adec91f3911cee5596ae0d7bbaf6b71 (diff)
Use a macro in the MI powerpc PCI header for pci_intr_line() instead
of a function in the MD macppc host bridge code. ok drahn@
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c8
-rw-r--r--sys/arch/powerpc/pci/pci_machdep.h3
2 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index cd624c24a0b..a8f09dc76c9 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.31 2006/03/13 20:10:49 brad Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.32 2006/05/10 00:07:40 brad Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -979,9 +979,3 @@ mpc_cfg_read_4(struct pcibr_config *cp, u_int32_t reg)
splx(s);
return(_v_);
}
-
-int
-pci_intr_line(pci_intr_handle_t ih)
-{
- return (ih);
-}
diff --git a/sys/arch/powerpc/pci/pci_machdep.h b/sys/arch/powerpc/pci/pci_machdep.h
index 60c1a0535be..22105772f0f 100644
--- a/sys/arch/powerpc/pci/pci_machdep.h
+++ b/sys/arch/powerpc/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.14 2002/09/15 09:01:59 deraadt Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.15 2006/05/10 00:07:40 brad Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -84,6 +84,7 @@ int pci_intr_line(pci_intr_handle_t ih);
#define pci_intr_map(pa, ihp) \
(*((pa)->pa_pc)->pc_intr_map)((pa)->pa_pc->pc_intr_v, \
(pa)->pa_intrtag, (pa)->pa_intrpin, (pa)->pa_intrline, (ihp))
+#define pci_intr_line(ih) (ih)
#define pci_intr_string(c, ih) \
(*(c)->pc_intr_string)((c)->pc_intr_v, (ih))
#define pci_intr_establish(c, ih, l, h, a, nm) \