summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/82xx/mpc82xx_ads.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2007-06-18 01:06:54 +0200
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 01:56:23 -0500
commit09b55f76c9e41ed88f445f64f00ed39b48ed137d (patch)
treefed87205ed14b98e208844ede72ecb9449d07fcf /arch/powerpc/platforms/82xx/mpc82xx_ads.c
parentb9fd305db0b4723e70f1a5cf06e4a6949755331c (diff)
downloadlinux-09b55f76c9e41ed88f445f64f00ed39b48ed137d.tar.gz
linux-09b55f76c9e41ed88f445f64f00ed39b48ed137d.tar.bz2
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/82xx/mpc82xx_ads.c')
-rw-r--r--arch/powerpc/platforms/82xx/mpc82xx_ads.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 47cb09f08052..dc16bb4422ac 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -515,7 +515,7 @@ static int m82xx_pci_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL;
}
-void __init add_bridge(struct device_node *np)
+static void __init mpc82xx_add_bridge(struct device_node *np)
{
int len;
struct pci_controller *hose;
@@ -584,7 +584,7 @@ static void __init mpc82xx_ads_setup_arch(void)
#ifdef CONFIG_PCI
ppc_md.pci_exclude_device = m82xx_pci_exclude_device;
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
- add_bridge(np);
+ mpc82xx_add_bridge(np);
of_node_put(np);
#endif