aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-04 11:25:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-04 11:25:31 -0700
commitc22072bdf053b115a1126658100967dda00b5ecf (patch)
tree21520119dbbfce237a5005e9840105e86944c9cc /arch
parent0640113be25d283e0ff77a9f041e1242182387f0 (diff)
parent62cf20b32aee4ae889a2eb40fd41c0eab73de970 (diff)
downloadlinux-linaro-stable-c22072bdf053b115a1126658100967dda00b5ecf.tar.gz
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner: "The clocksource driver is pure hardware enablement and the skew option is default off, well tested and non dangerous." * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick: Move skew_tick option into the HIGH_RES_TIMER section clocksource: em_sti: Add DT support clocksource: em_sti: Emma Mobile STI driver clockevents: Make clockevents_config() a global symbol tick: Add tick skew boot option
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f31383c32f9c..df33909205e2 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -186,6 +186,12 @@ config SH_TIMER_TMU
help
This enables build of the TMU timer driver.
+config EM_TIMER_STI
+ bool "STI timer driver"
+ default y
+ help
+ This enables build of the STI timer driver.
+
endmenu
config SH_CLK_CPG