diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-08-25 07:38:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-08-25 07:38:47 -0400 |
| commit | d555dd5065ab6dd4437c609950c5d9c6377b4896 (patch) | |
| tree | a2335e9d68a74cb833964ba9617d7279b98a6cdd /arch/arm/plat-omap/common.c | |
| parent | 9d84588bdb72b6ec9d891fbdaa4305023e16ee3a (diff) | |
| parent | 671c7235ccd537f828986ef5a4071bf477541dc0 (diff) | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 7987aa6e95f8..4f0f9c4e938e 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -172,7 +172,7 @@ console_initcall(omap_add_serial_console); | |||
| 172 | #if defined(CONFIG_ARCH_OMAP16XX) | 172 | #if defined(CONFIG_ARCH_OMAP16XX) |
| 173 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 | 173 | #define TIMER_32K_SYNCHRONIZED 0xfffbc410 |
| 174 | #elif defined(CONFIG_ARCH_OMAP24XX) | 174 | #elif defined(CONFIG_ARCH_OMAP24XX) |
| 175 | #define TIMER_32K_SYNCHRONIZED 0x48004010 | 175 | #define TIMER_32K_SYNCHRONIZED (OMAP24XX_32KSYNCT_BASE + 0x10) |
| 176 | #endif | 176 | #endif |
| 177 | 177 | ||
| 178 | #ifdef TIMER_32K_SYNCHRONIZED | 178 | #ifdef TIMER_32K_SYNCHRONIZED |