diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 05:03:03 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 05:03:03 -0500 |
| commit | 90889a635a9b5488624bccce3ff6b2eec68c007b (patch) | |
| tree | 8ddde1e04060bd65ca2aafb09b38066cb7d69b4d /arch/x86/Kconfig | |
| parent | a9037430c6c784165a940a90bcd29f886834c8e7 (diff) | |
| parent | 6f16eebe1ff82176339a0439c98ebec9768b0ee2 (diff) | |
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 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 225543bf45a5..97b023f0cbe8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -106,6 +106,7 @@ config X86 | |||
| 106 | select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC) | 106 | select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC) |
| 107 | select GENERIC_TIME_VSYSCALL if X86_64 | 107 | select GENERIC_TIME_VSYSCALL if X86_64 |
| 108 | select KTIME_SCALAR if X86_32 | 108 | select KTIME_SCALAR if X86_32 |
| 109 | select ALWAYS_USE_PERSISTENT_CLOCK | ||
| 109 | select GENERIC_STRNCPY_FROM_USER | 110 | select GENERIC_STRNCPY_FROM_USER |
| 110 | select GENERIC_STRNLEN_USER | 111 | select GENERIC_STRNLEN_USER |
| 111 | select HAVE_CONTEXT_TRACKING if X86_64 | 112 | select HAVE_CONTEXT_TRACKING if X86_64 |