git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
timer32k.c
diff --git
a/arch/arm/mach-omap1/timer32k.c
b/arch/arm/mach-omap1/timer32k.c
index
13d7b8f
..
96604a5
100644
(file)
--- 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;