summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2003-01-05 20:31:30 +1100
committerPaul Mackerras <paulus@samba.org>2003-01-05 20:31:30 +1100
commitb431af20d15e67958e992a81d4c2870d29dd53ca (patch)
tree3cb3d930dd14bf637e13163cb0b94825881f2051 /include
parent751f60377eb550dd4d084d4cd1ea673aeab47e62 (diff)
PPC32: move some declarations from asm/pci-bridge.h to asm/prom.h
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/pci-bridge.h9
-rw-r--r--include/asm-ppc/prom.h11
2 files changed, 11 insertions, 9 deletions
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index f17cca329ed9..1b5ca6200ec0 100644
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -23,15 +23,6 @@ extern struct pci_controller* pcibios_alloc_controller(void);
extern void pci_init_resource(struct resource *res, unsigned long start,
unsigned long end, int flags, char *name);
-/*
- * PCI <-> OF matching functions
- */
-extern int pci_device_from_OF_node(struct device_node *node,
- u8* bus, u8* devfn);
-extern struct device_node* pci_busdev_to_OF_node(struct pci_bus *, int);
-extern struct device_node* pci_device_to_OF_node(struct pci_dev *);
-extern void pci_create_OF_bus_map(void);
-
/* Get the PCI host controller for a bus */
extern struct pci_controller* pci_bus_to_hose(int bus);
diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
index b3e27a837485..4401164ac7fe 100644
--- a/include/asm-ppc/prom.h
+++ b/include/asm-ppc/prom.h
@@ -92,6 +92,17 @@ extern int call_rtas(const char *service, int nargs, int nret,
unsigned long *outputs, ...);
/*
+ * PCI <-> OF matching functions
+ */
+struct pci_bus;
+struct pci_dev;
+extern int pci_device_from_OF_node(struct device_node *node,
+ u8* bus, u8* devfn);
+extern struct device_node* pci_busdev_to_OF_node(struct pci_bus *, int);
+extern struct device_node* pci_device_to_OF_node(struct pci_dev *);
+extern void pci_create_OF_bus_map(void);
+
+/*
* When we call back to the Open Firmware client interface, we usually
* have to do that before the kernel is relocated to its final location
* (this is because we can't use OF after we have overwritten the