summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/83xx/mpc836x_mds.c
diff options
context:
space:
mode:
authorArnd Bergmann2007-06-18 01:06:54 +0200
committerKumar Gala2007-06-29 08:56:23 +0200
commit09b55f76c9e41ed88f445f64f00ed39b48ed137d (patch)
treefed87205ed14b98e208844ede72ecb9449d07fcf /arch/powerpc/platforms/83xx/mpc836x_mds.c
parent[POWERPC] move 82xx/83xx/86xx Kconfig options to platform selection (diff)
downloadkernel-qcow2-linux-09b55f76c9e41ed88f445f64f00ed39b48ed137d.tar.gz
kernel-qcow2-linux-09b55f76c9e41ed88f445f64f00ed39b48ed137d.tar.xz
kernel-qcow2-linux-09b55f76c9e41ed88f445f64f00ed39b48ed137d.zip
[POWERPC] rename add_bridge to avoid namespace clashes
Many platforms currently define their own add_bridge function, some of them globally. This breaks some multiplatform configurations. Prefixing each of these functions with the platform name avoids this problem. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc836x_mds.c')
-rw-r--r--arch/powerpc/platforms/83xx/mpc836x_mds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index bceeff8bbfd2..bf3be3741129 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -86,7 +86,7 @@ static void __init mpc836x_mds_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
- add_bridge(np);
+ mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif