[kernel] r15118 - in dists/trunk/linux-2.6/debian/config: . kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Thu Feb  4 09:51:13 2010
New Revision: 15118

Log:
debian/config: Reorder.

Modified:
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu Feb  4 09:33:43 2010	(r15117)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Feb  4 09:51:13 2010	(r15118)
@@ -3336,12 +3336,12 @@
 ## file: mm/Kconfig
 ##
 CONFIG_MEMORY_HOTPLUG=y
-CONFIG_HWPOISON_INJECT=m
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MIGRATION=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
 
 ##
 ## file: net/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Feb  4 09:33:43 2010	(r15117)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Feb  4 09:51:13 2010	(r15118)
@@ -1,10 +1,10 @@
 ##
 ## file: arch/Kconfig
 ##
-# CONFIG_KPROBES is not set
 CONFIG_OPROFILE=m
 CONFIG_OPROFILE_IBS=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+# CONFIG_KPROBES is not set
 
 ##
 ## file: arch/x86/Kconfig