diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 06:32:13 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 06:32:13 -0400 |
| commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
| tree | 651f7058bbaa2d8b2855286380d614afcf505118 /arch/arm/mach-kirkwood/common.h | |
| parent | 31db6e9ea1dbdcf66b8227b4f7035dee1b1dd8c0 (diff) | |
| parent | bef69ea0dcce574a425feb0a5aa4c63dd108b9a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-kirkwood/common.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 5dee2f6b40a5..69cd113af03a 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h | |||
| @@ -33,8 +33,11 @@ void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); | |||
| 33 | void kirkwood_pcie_init(void); | 33 | void kirkwood_pcie_init(void); |
| 34 | void kirkwood_rtc_init(void); | 34 | void kirkwood_rtc_init(void); |
| 35 | void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); | 35 | void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); |
| 36 | void kirkwood_spi_init(void); | ||
| 36 | void kirkwood_uart0_init(void); | 37 | void kirkwood_uart0_init(void); |
| 37 | void kirkwood_uart1_init(void); | 38 | void kirkwood_uart1_init(void); |
| 39 | void kirkwood_xor0_init(void); | ||
| 40 | void kirkwood_xor1_init(void); | ||
| 38 | 41 | ||
| 39 | extern struct sys_timer kirkwood_timer; | 42 | extern struct sys_timer kirkwood_timer; |
| 40 | 43 | ||