Merge ARM fixes

[sfrench/cifs-2.6.git] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 458b3aad3eb3203b2c4844c72e0f392ccb22acc1..2f7672545fe98ae0096d0249fefcf250dbdab5df 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -22,6 +22,15 @@ config CLOCKSOURCE_WATCHDOG
        bool
        default y
 
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+       bool
+       default y
+       depends on X86_LOCAL_APIC
+
 config LOCKDEP_SUPPORT
        bool
        default y
@@ -78,6 +87,8 @@ source "init/Kconfig"
 
 menu "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 config SMP
        bool "Symmetric multi-processing support"
        ---help---