aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-12 08:40:13 +1000
committerPaul Mackerras <paulus@samba.org>2007-10-12 08:40:13 +1000
commit895532a166010d8d8b4d58d63d21012eced22492 (patch)
tree708097789ac9cb2670407b12ee37b8653385b5e6 /include
parentad656887e22390c64276e0a0057541aec701422c (diff)
parente1eea9fa00da50ed3dfb64ce669e9ae0b70c0629 (diff)
Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.24
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/mpc52xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h
index 1a3dbb743a3..24751df791a 100644
--- a/include/asm-powerpc/mpc52xx.h
+++ b/include/asm-powerpc/mpc52xx.h
@@ -243,7 +243,7 @@ struct mpc52xx_cdm {
extern void __iomem * mpc52xx_find_and_map(const char *);
extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node);
-extern void mpc52xx_setup_cpu(void);
+extern void mpc5200_setup_xlb_arbiter(void);
extern void mpc52xx_declare_of_platform_devices(void);
extern void mpc52xx_init_irq(void);