diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-11 18:40:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-11 18:40:13 -0400 |
| commit | 895532a166010d8d8b4d58d63d21012eced22492 (patch) | |
| tree | 708097789ac9cb2670407b12ee37b8653385b5e6 /include/asm-powerpc | |
| parent | ad656887e22390c64276e0a0057541aec701422c (diff) | |
| parent | e1eea9fa00da50ed3dfb64ce669e9ae0b70c0629 (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/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/mpc52xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h index 1a3dbb743a3f..24751df791ac 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h | |||
| @@ -243,7 +243,7 @@ struct mpc52xx_cdm { | |||
| 243 | 243 | ||
| 244 | extern void __iomem * mpc52xx_find_and_map(const char *); | 244 | extern void __iomem * mpc52xx_find_and_map(const char *); |
| 245 | extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); | 245 | extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); |
| 246 | extern void mpc52xx_setup_cpu(void); | 246 | extern void mpc5200_setup_xlb_arbiter(void); |
| 247 | extern void mpc52xx_declare_of_platform_devices(void); | 247 | extern void mpc52xx_declare_of_platform_devices(void); |
| 248 | 248 | ||
| 249 | extern void mpc52xx_init_irq(void); | 249 | extern void mpc52xx_init_irq(void); |