Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / arch / powerpc / platforms / 86xx / mpc86xx.h

diff --git a/arch/powerpc/platforms/86xx/mpc86xx.h b/arch/powerpc/platforms/86xx/mpc86xx.h
index e3c9e4f417d39f95505e118c7a7b5dfedef743a6..23f7ed2a7f884b9583f131929344f634bc976394 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx.h
+++ b/arch/powerpc/platforms/86xx/mpc86xx.h
@@ -15,13 +15,10 @@
  * mpc86xx_* files. Mostly for use by mpc86xx_setup().
  */
 
-extern int __init add_bridge(struct device_node *dev);
+extern int mpc86xx_add_bridge(struct device_node *dev);
 
-extern void __init setup_indirect_pcie(struct pci_controller *hose,
-                                      u32 cfg_addr, u32 cfg_data);
-extern void __init setup_indirect_pcie_nomap(struct pci_controller *hose,
-                                            void __iomem *cfg_addr,
-                                            void __iomem *cfg_data);
+extern int mpc86xx_exclude_device(struct pci_controller *hose,
+                                 u_char bus, u_char devfn);
 
 extern void __init mpc86xx_smp_init(void);