diff options
author | Paul Mackerras <paulus@samba.org> | 2008-01-30 18:50:17 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 18:50:17 -0500 |
commit | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch) | |
tree | b8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38 /include | |
parent | cda13dd164f91df79ba797ab84848352b03de115 (diff) | |
parent | 4fb4c5582475452d3bf7c5072ef2d15ee06f7723 (diff) |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/mpc52xx.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h index 1c48c6d16335..81ef10b6b672 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h | |||
@@ -248,13 +248,19 @@ struct mpc52xx_cdm { | |||
248 | 248 | ||
249 | #ifndef __ASSEMBLY__ | 249 | #ifndef __ASSEMBLY__ |
250 | 250 | ||
251 | /* mpc52xx_common.c */ | ||
251 | extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); | 252 | extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); |
252 | extern void mpc5200_setup_xlb_arbiter(void); | 253 | extern void mpc5200_setup_xlb_arbiter(void); |
253 | extern void mpc52xx_declare_of_platform_devices(void); | 254 | extern void mpc52xx_declare_of_platform_devices(void); |
255 | extern void mpc52xx_map_common_devices(void); | ||
256 | extern int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv); | ||
257 | extern void mpc52xx_restart(char *cmd); | ||
254 | 258 | ||
259 | /* mpc52xx_pic.c */ | ||
255 | extern void mpc52xx_init_irq(void); | 260 | extern void mpc52xx_init_irq(void); |
256 | extern unsigned int mpc52xx_get_irq(void); | 261 | extern unsigned int mpc52xx_get_irq(void); |
257 | 262 | ||
263 | /* mpc52xx_pci.c */ | ||
258 | #ifdef CONFIG_PCI | 264 | #ifdef CONFIG_PCI |
259 | extern int __init mpc52xx_add_bridge(struct device_node *node); | 265 | extern int __init mpc52xx_add_bridge(struct device_node *node); |
260 | extern void __init mpc52xx_setup_pci(void); | 266 | extern void __init mpc52xx_setup_pci(void); |
@@ -262,9 +268,6 @@ extern void __init mpc52xx_setup_pci(void); | |||
262 | static inline void mpc52xx_setup_pci(void) { } | 268 | static inline void mpc52xx_setup_pci(void) { } |
263 | #endif | 269 | #endif |
264 | 270 | ||
265 | extern void __init mpc52xx_map_wdt(void); | ||
266 | extern void mpc52xx_restart(char *cmd); | ||
267 | |||
268 | #endif /* __ASSEMBLY__ */ | 271 | #endif /* __ASSEMBLY__ */ |
269 | 272 | ||
270 | #ifdef CONFIG_PM | 273 | #ifdef CONFIG_PM |