summaryrefslogtreecommitdiff
path: root/kernel/time/Kconfig
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-02-04 14:03:03 +0400
committerThomas Gleixner <tglx@linutronix.de>2013-02-04 14:03:03 +0400
commit90889a635a9b5488624bccce3ff6b2eec68c007b (patch)
tree8ddde1e04060bd65ca2aafb09b38066cb7d69b4d /kernel/time/Kconfig
parenta9037430c6c784165a940a90bcd29f886834c8e7 (diff)
parent6f16eebe1ff82176339a0439c98ebec9768b0ee2 (diff)
downloadlinux-90889a635a9b5488624bccce3ff6b2eec68c007b.tar.xz
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Trivial conflict in arch/x86/Kconfig Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/Kconfig')
-rw-r--r--kernel/time/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index b69692250af4..24510d84efd7 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -12,6 +12,11 @@ config CLOCKSOURCE_WATCHDOG
config ARCH_CLOCKSOURCE_DATA
bool
+# Platforms has a persistent clock
+config ALWAYS_USE_PERSISTENT_CLOCK
+ bool
+ default n
+
# Timekeeping vsyscall support
config GENERIC_TIME_VSYSCALL
bool