diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-06-24 17:45:02 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2013-06-24 17:45:02 -0700 |
commit | 42cba6e27c4cddc4df701c597dbfa666e1c013c8 (patch) | |
tree | 6fe38f37a79391bce3db56f311d0f3b83711fad0 /kernel/time/Kconfig | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
parent | 2699339361a9bacb3fa663e6b8981a040cfca4ee (diff) | |
download | blackbird-op-linux-42cba6e27c4cddc4df701c597dbfa666e1c013c8.tar.gz blackbird-op-linux-42cba6e27c4cddc4df701c597dbfa666e1c013c8.zip |
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into remove-local-timers
Diffstat (limited to 'kernel/time/Kconfig')
-rw-r--r-- | kernel/time/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index e4c07b0692bb..70f27e89012b 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -12,11 +12,6 @@ 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 |