Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6] / kernel / time / Kconfig

diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 9ec54eb3667f9922abcf29ec9eedd002ada6af91..8d53106a0a92c1dd619b6dc0f5e7841fc10824b4 100644 (file)
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -13,3 +13,18 @@ config NO_HZ
          This option enables a tickless system: timer interrupts will
          only trigger on an as-needed basis both when the system is
          busy and when the system is idle.
+
+config HIGH_RES_TIMERS
+       bool "High Resolution Timer Support"
+       depends on GENERIC_TIME && GENERIC_CLOCKEVENTS
+       select TICK_ONESHOT
+       help
+         This option enables high resolution timer support. If your
+         hardware is not capable then this option only increases
+         the size of the kernel image.
+
+config GENERIC_CLOCKEVENTS_BUILD
+       bool
+       default y
+       depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR
+