diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /arch/arm/plat-omap/common.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
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 |