Merge commit 'v2.6.33' into tracing/core

[mv-sheeva.git] / kernel / time / Kconfig

diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 8d53106a0a92c1dd619b6dc0f5e7841fc10824b4..95ed42951e0adb536db3783b5d026914ddfdbc73 100644 (file)
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -3,7 +3,6 @@
 #
 config TICK_ONESHOT
        bool
-       default n
 
 config NO_HZ
        bool "Tickless System (Dynamic Ticks)"