summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/85xx/mpc85xx_cds.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2007-06-18 03:06:54 +0400
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 10:56:23 +0400
commit09b55f76c9e41ed88f445f64f00ed39b48ed137d (patch)
treefed87205ed14b98e208844ede72ecb9449d07fcf /arch/powerpc/platforms/85xx/mpc85xx_cds.c
parentb9fd305db0b4723e70f1a5cf06e4a6949755331c (diff)
downloadlinux-09b55f76c9e41ed88f445f64f00ed39b48ed137d.tar.xz
[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/85xx/mpc85xx_cds.c')
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_cds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 1490eb3ce0d3..40592540ec77 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -257,7 +257,7 @@ static void __init mpc85xx_cds_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
- add_bridge(np);
+ mpc85xx_add_bridge(np);
ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
ppc_md.pci_exclude_device = mpc85xx_exclude_device;