- options not specific to arch/x86 directory moved from x86.config

  to multiarch.config

Changed files:
    kernel-multiarch.config -> 1.30
    kernel-x86.config -> 1.21

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 6ffd4d008a48ef31789cb1b72ef62fd2938b3093..d5c3763bca60b439250bd41dc55c56523fb02035 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3093,6 +3093,7 @@ PCCARD_NONSTATIC all=m
 #-
 #- *** FILE: drivers/platform/x86/Kconfig ***
 #-
+X86_PLATFORM_DEVICES i386=y x86_64=y
 ACER_WMI all=m
 ASUS_LAPTOP i386=m x86_64=m
 DELL_WMI all=m
@@ -5241,6 +5242,7 @@ KMEMTRACE all=n
 WORKQUEUE_TRACER all=n
 BLK_DEV_IO_TRACE all=n
 FTRACE_STARTUP_TEST all=n
+MMIOTRACE x86=n
 RING_BUFFER_BENCHMARK all=m
 
 #-
@@ -5371,6 +5373,11 @@ DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 MEMORY_FAILURE all=y
 HWPOISON_INJECT all=m
 
+#-
+#- *** FILE: mm/Kconfig.debug ***
+#-
+DEBUG_PAGEALLOC x86=n
+
 #-
 #- *** FILE: net/8021q/Kconfig ***
 #-

diff --git a/kernel-x86.config b/kernel-x86.config
index 0687c0d196704895707bd3592601af5c45c0cc92..9a376dc17957beae2709bccee2e5226dc706d32b 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -241,18 +241,3 @@ KVM_AMD x86=m
 #- *** FILE: arch/x86/xen/Kconfig ***
 #-
 XEN i386=n
-
-#-
-#- *** FILE: drivers/platform/x86/Kconfig ***
-#-
-X86_PLATFORM_DEVICES i386=y x86_64=y
-
-#-
-#- *** FILE: kernel/trace/Kconfig ***
-#-
-MMIOTRACE x86=n
-
-#-
-#- *** FILE: mm/Kconfig.debug ***
-#-
-DEBUG_PAGEALLOC x86=n