git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8132ed1)
ARM: ux500: Don't attempt to enable the Nomadik System Timer twice
authorLee Jones <lee.jones@linaro.org>
Wed, 18 Sep 2013 07:55:19 +0000 (08:55 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 26 Sep 2013 09:05:18 +0000 (11:05 +0200)
When booting with DT enabled we already call clocksource_of_init(),
which in turn calls the OF version of nmdk_timer_init().

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ux500/timer.c patch | blob | history

diff --cc arch/arm/mach-ux500/timer.c
Simple merge
Pandora Kernel Repository