Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

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

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index f4b582cbb5678a541e9a972ef8f31d27399d69a9..6abbbb8aac5ebc733f7e4eb8cc8df3df6ef3959c 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -53,6 +53,10 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
 config TIME_LOW_RES
        bool
        default y
@@ -707,8 +711,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/m68knommu/Kconfig.debug"
 
 source "security/Kconfig"