Merge branch 'linux-2.6'

[linux-2.6] / kernel / time / Kconfig

diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index f66351126544801116759583e26736f45ffb8402..8d53106a0a92c1dd619b6dc0f5e7841fc10824b4 100644 (file)
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -23,3 +23,8 @@ config HIGH_RES_TIMERS
          hardware is not capable then this option only increases
          the size of the kernel image.
 
          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
+