diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:44:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:44:10 +0200 |
| commit | 6c59c115b0f295434cc4f917d180fecd84d39f81 (patch) | |
| tree | 659a2b63552dd53211f86c60930900520cba3686 /arch/arm/mach-omap1/timer32k.c | |
| parent | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (diff) | |
| parent | 257d643d7d7cd81075b6dee88cfba14f773805c7 (diff) | |
Merge branch 'omap/4460' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Diffstat (limited to 'arch/arm/mach-omap1/timer32k.c')
| -rw-r--r-- | arch/arm/mach-omap1/timer32k.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 13d7b8f145b..96604a50c4f 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -183,10 +183,6 @@ static __init void omap_init_32k_timer(void) bool __init omap_32k_timer_init(void) { omap_init_clocksource_32k(); - -#ifdef CONFIG_OMAP_DM_TIMER - omap_dm_timer_init(); -#endif omap_init_32k_timer(); return true; |