aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-01-30 18:50:17 -0500
committerPaul Mackerras <paulus@samba.org>2008-01-30 18:50:17 -0500
commit4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch)
treeb8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38 /include
parentcda13dd164f91df79ba797ab84848352b03de115 (diff)
parent4fb4c5582475452d3bf7c5072ef2d15ee06f7723 (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.h9
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 */
251extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); 252extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node);
252extern void mpc5200_setup_xlb_arbiter(void); 253extern void mpc5200_setup_xlb_arbiter(void);
253extern void mpc52xx_declare_of_platform_devices(void); 254extern void mpc52xx_declare_of_platform_devices(void);
255extern void mpc52xx_map_common_devices(void);
256extern int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv);
257extern void mpc52xx_restart(char *cmd);
254 258
259/* mpc52xx_pic.c */
255extern void mpc52xx_init_irq(void); 260extern void mpc52xx_init_irq(void);
256extern unsigned int mpc52xx_get_irq(void); 261extern unsigned int mpc52xx_get_irq(void);
257 262
263/* mpc52xx_pci.c */
258#ifdef CONFIG_PCI 264#ifdef CONFIG_PCI
259extern int __init mpc52xx_add_bridge(struct device_node *node); 265extern int __init mpc52xx_add_bridge(struct device_node *node);
260extern void __init mpc52xx_setup_pci(void); 266extern void __init mpc52xx_setup_pci(void);
@@ -262,9 +268,6 @@ extern void __init mpc52xx_setup_pci(void);
262static inline void mpc52xx_setup_pci(void) { } 268static inline void mpc52xx_setup_pci(void) { }
263#endif 269#endif
264 270
265extern void __init mpc52xx_map_wdt(void);
266extern void mpc52xx_restart(char *cmd);
267
268#endif /* __ASSEMBLY__ */ 271#endif /* __ASSEMBLY__ */
269 272
270#ifdef CONFIG_PM 273#ifdef CONFIG_PM