diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /include/asm-arm/arch-mxc/common.h | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'include/asm-arm/arch-mxc/common.h')
| -rw-r--r-- | include/asm-arm/arch-mxc/common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-mxc/common.h b/include/asm-arm/arch-mxc/common.h index 23b4350edbd6..a6d2e24aab15 100644 --- a/include/asm-arm/arch-mxc/common.h +++ b/include/asm-arm/arch-mxc/common.h | |||
| @@ -11,10 +11,10 @@ | |||
| 11 | #ifndef __ASM_ARCH_MXC_COMMON_H__ | 11 | #ifndef __ASM_ARCH_MXC_COMMON_H__ |
| 12 | #define __ASM_ARCH_MXC_COMMON_H__ | 12 | #define __ASM_ARCH_MXC_COMMON_H__ |
| 13 | 13 | ||
| 14 | struct sys_timer; | ||
| 15 | |||
| 16 | extern void mxc_map_io(void); | 14 | extern void mxc_map_io(void); |
| 17 | extern void mxc_init_irq(void); | 15 | extern void mxc_init_irq(void); |
| 18 | extern struct sys_timer mxc_timer; | 16 | extern void mxc_timer_init(const char *clk_timer); |
| 17 | extern int mxc_clocks_init(unsigned long fref); | ||
| 18 | extern int mxc_register_gpios(void); | ||
| 19 | 19 | ||
| 20 | #endif | 20 | #endif |