Pull sbs into release branch

[pandora-kernel.git] / arch / powerpc / platforms / 86xx / mpc86xx.h

diff --git a/arch/powerpc/platforms/86xx/mpc86xx.h b/arch/powerpc/platforms/86xx/mpc86xx.h
index 2834462..23f7ed2 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx.h
+++ b/arch/powerpc/platforms/86xx/mpc86xx.h
@@ -15,15 +15,10 @@
  * mpc86xx_* files. Mostly for use by mpc86xx_setup().
  */
 
-extern int add_bridge(struct device_node *dev);
+extern int mpc86xx_add_bridge(struct device_node *dev);
 
-extern int mpc86xx_exclude_device(u_char bus, u_char devfn);
-
-extern void setup_indirect_pcie(struct pci_controller *hose,
-                                      u32 cfg_addr, u32 cfg_data);
-extern void 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);