aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/ppc-pci.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-16 19:27:08 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-16 19:27:08 -0500
commitabc71c46dc0a12ab7fddc18cfe4f4aa26808c79b (patch)
treeb0c846052b994d57d58713a0cc8da30a22baaf1c /include/asm-powerpc/ppc-pci.h
parent[PATCH] drivers/net/e1000/: proper prototypes (diff)
parent[netdrvr] fix array overflows in Chelsio driver (diff)
downloadlinux-dev-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.tar.xz
linux-dev-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.zip
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/asm-powerpc/ppc-pci.h')
-rw-r--r--include/asm-powerpc/ppc-pci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index f80482c7231f..cf79bc7ebb55 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -38,6 +38,7 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
void pci_devs_phb_init(void);
void pci_devs_phb_init_dynamic(struct pci_controller *phb);
+int setup_phb(struct device_node *dev, struct pci_controller *phb);
void __devinit scan_phb(struct pci_controller *hose);
/* From rtas_pci.h */