Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 09ce2ab792e169122c2a11253a328499a916e023..464ba6678b87de4b6e61a693db304a6ccb8d6978 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -75,10 +75,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_TIME
-       bool
-       default y
-
 config GENERIC_TIME_VSYSCALL
        bool
        default y
@@ -496,8 +492,7 @@ config USE_PERCPU_NUMA_NODE_ID
        depends on NUMA
 
 config HAVE_MEMORYLESS_NODES
-       def_bool y
-       depends on NUMA
+       def_bool NUMA
 
 config ARCH_PROC_KCORE_TEXT
        def_bool y