Merge branch 'master' into for-next

[pandora-kernel.git] / kernel / Kconfig.hz

diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 4af1580..526128a 100644 (file)
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -54,3 +54,5 @@ config HZ
        default 300 if HZ_300
        default 1000 if HZ_1000
 
+config SCHED_HRTICK
+       def_bool HIGH_RES_TIMERS && X86