diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 10:50:17 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 10:50:17 +1100 |
| commit | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch) | |
| tree | b8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38 /include/asm-powerpc | |
| parent | cda13dd164f91df79ba797ab84848352b03de115 (diff) | |
| parent | 4fb4c5582475452d3bf7c5072ef2d15ee06f7723 (diff) | |
| download | linux-3.10-4eece4ccf997c0e6d8fdad3d842e37b16b8d705f.tar.gz linux-3.10-4eece4ccf997c0e6d8fdad3d842e37b16b8d705f.tar.bz2 linux-3.10-4eece4ccf997c0e6d8fdad3d842e37b16b8d705f.zip | |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat (limited to 'include/asm-powerpc')
| -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 1c48c6d1633..81ef10b6b67 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h @@ -248,13 +248,19 @@ struct mpc52xx_cdm { #ifndef __ASSEMBLY__ +/* mpc52xx_common.c */ extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); extern void mpc5200_setup_xlb_arbiter(void); extern void mpc52xx_declare_of_platform_devices(void); +extern void mpc52xx_map_common_devices(void); +extern int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv); +extern void mpc52xx_restart(char *cmd); +/* mpc52xx_pic.c */ extern void mpc52xx_init_irq(void); extern unsigned int mpc52xx_get_irq(void); +/* mpc52xx_pci.c */ #ifdef CONFIG_PCI extern int __init mpc52xx_add_bridge(struct device_node *node); extern void __init mpc52xx_setup_pci(void); @@ -262,9 +268,6 @@ extern void __init mpc52xx_setup_pci(void); static inline void mpc52xx_setup_pci(void) { } #endif -extern void __init mpc52xx_map_wdt(void); -extern void mpc52xx_restart(char *cmd); - #endif /* __ASSEMBLY__ */ #ifdef CONFIG_PM |