aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/83xx/pci.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/83xx/pci.c
parent[POWERPC] move 82xx/83xx/86xx Kconfig options to platform selection (diff)
downloadlinux-dev-09b55f76c9e41ed88f445f64f00ed39b48ed137d.tar.xz
linux-dev-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/pci.c')
-rw-r--r--arch/powerpc/platforms/83xx/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 774457d09e94..1752d4577aaf 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -45,7 +45,7 @@ int mpc83xx_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL;
}
-int __init add_bridge(struct device_node *dev)
+int __init mpc83xx_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;