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 8711d13cd79f3e1a354115b467b83c13c738ef02..464ba6678b87de4b6e61a693db304a6ccb8d6978 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "IA-64 Linux Kernel Configuration"
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -499,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