aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/82xx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2007-06-17 19:06:54 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 02:56:23 -0400
commit09b55f76c9e41ed88f445f64f00ed39b48ed137d (patch)
treefed87205ed14b98e208844ede72ecb9449d07fcf /arch/powerpc/platforms/82xx
parentb9fd305db0b4723e70f1a5cf06e4a6949755331c (diff)
[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')
-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)
515 return PCIBIOS_SUCCESSFUL; 515 return PCIBIOS_SUCCESSFUL;
516} 516}
517 517
518void __init add_bridge(struct device_node *np) 518static void __init mpc82xx_add_bridge(struct device_node *np)
519{ 519{
520 int len; 520 int len;
521 struct pci_controller *hose; 521 struct pci_controller *hose;
@@ -584,7 +584,7 @@ static void __init mpc82xx_ads_setup_arch(void)
584#ifdef CONFIG_PCI 584#ifdef CONFIG_PCI
585 ppc_md.pci_exclude_device = m82xx_pci_exclude_device; 585 ppc_md.pci_exclude_device = m82xx_pci_exclude_device;
586 for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) 586 for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
587 add_bridge(np); 587 mpc82xx_add_bridge(np);
588 588
589 of_node_put(np); 589 of_node_put(np);
590#endif 590#endif