packages: kernel/kernel-x86.config, kernel/kernel-multiarch.config - option...

[sparky]

Author: sparky                       Date: Fri Dec  4 21:49:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- options not specific to arch/x86 directory moved from x86.config
  to multiarch.config

---- Files affected:
packages/kernel:
   kernel-x86.config (1.20 -> 1.21) , kernel-multiarch.config (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-x86.config
diff -u packages/kernel/kernel-x86.config:1.20 packages/kernel/kernel-x86.config:1.21
--- packages/kernel/kernel-x86.config:1.20	Fri Dec  4 22:46:06 2009
+++ packages/kernel/kernel-x86.config	Fri Dec  4 22:49:30 2009
@@ -241,18 +241,3 @@
 #- *** 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

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.29 packages/kernel/kernel-multiarch.config:1.30
--- packages/kernel/kernel-multiarch.config:1.29	Fri Dec  4 22:46:06 2009
+++ packages/kernel/kernel-multiarch.config	Fri Dec  4 22:49:30 2009
@@ -3093,6 +3093,7 @@
 #-
 #- *** 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 @@
 WORKQUEUE_TRACER all=n
 BLK_DEV_IO_TRACE all=n
 FTRACE_STARTUP_TEST all=n
+MMIOTRACE x86=n
 RING_BUFFER_BENCHMARK all=m
 
 #-
@@ -5370,6 +5372,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 ***
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.29&r2=1.30&f=u