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

[Bastian Blank]

Author: waldi
Date: Thu Jan 21 14:49:34 2010
New Revision: 14966

Log:
debian/config/armel/config, debian/config/config,
debian/config/kernelarch-x86/config-arch-64: Reorder.

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

Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config	Thu Jan 21 14:44:36 2010	(r14965)
+++ dists/trunk/linux-2.6/debian/config/armel/config	Thu Jan 21 14:49:34 2010	(r14966)
@@ -8,6 +8,12 @@
 CONFIG_OABI_COMPAT=y
 
 ##
+## file: arch/arm/Kconfig.debug
+##
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+
+##
 ## file: drivers/ieee1394/Kconfig
 ##
 # CONFIG_IEEE1394 is not set
@@ -81,6 +87,3 @@
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
 
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu Jan 21 14:44:36 2010	(r14965)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Jan 21 14:49:34 2010	(r14966)
@@ -565,11 +565,11 @@
 ## file: drivers/input/keyboard/Kconfig
 ##
 CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_QT2160=m
 CONFIG_KEYBOARD_LM8323=m
 CONFIG_KEYBOARD_MAX7359=m
 CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_STOWAWAY=m
 
 ##
 ## file: drivers/input/misc/Kconfig
@@ -618,7 +618,6 @@
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -627,6 +626,7 @@
 CONFIG_TOUCHSCREEN_USB_GUNZE=y
 CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
 CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_W90X900=m
@@ -892,7 +892,6 @@
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
-CONFIG_I2C_SI470X=y
 CONFIG_RADIO_SI470X=y
 CONFIG_USB_MR800=m
 CONFIG_RADIO_TEA5764=m
@@ -901,6 +900,7 @@
 ## file: drivers/media/radio/si470x/Kconfig
 ##
 CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=y
 
 ##
 ## file: drivers/media/video/Kconfig
@@ -1209,9 +1209,9 @@
 CONFIG_MFD_MC13783=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
-# CONFIG_EZX_PCAP is not set
 CONFIG_AB3100_CORE=m
 CONFIG_AB3100_OTP=m
+# CONFIG_EZX_PCAP is not set
 
 ##
 ## file: drivers/misc/Kconfig
@@ -1614,6 +1614,7 @@
 ##
 ## file: drivers/net/wireless/Kconfig
 ##
+CONFIG_WLAN=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -1998,7 +1999,7 @@
 # CONFIG_AIC94XX_DEBUG is not set
 
 ##
-## file: drivers/scsi/bnx2i/Kconfig
+## file: drivers/scsi/be2iscsi/Kconfig
 ##
 CONFIG_BE2ISCSI=m
 
@@ -2195,11 +2196,6 @@
 # CONFIG_OTUS is not set
 
 ##
-## file: drivers/staging/quatech_usb2/Kconfig
-##
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-
-##
 ## file: drivers/staging/p9auth/Kconfig
 ##
 # CONFIG_PLAN9AUTH is not set
@@ -2225,6 +2221,11 @@
 # CONFIG_POHMELFS is not set
 
 ##
+## file: drivers/staging/quatech_usb2/Kconfig
+##
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+
+##
 ## file: drivers/staging/rar/Kconfig
 ##
 # CONFIG_RAR_REGISTER is not set
@@ -3224,9 +3225,11 @@
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_BOOT_TRACER=y
-CONFIG_BRANCH_PROFILE_NONE=y 
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 
+## choice: Branch Profiling
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
+## end choice
 # CONFIG_POWER_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_HW_BRANCH_TRACER is not set
@@ -3823,7 +3826,6 @@
 ##
 ## file: net/wireless/Kconfig
 ##
-CONFIG_WLAN=y
 CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -3860,9 +3862,9 @@
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
-# CONFIG_INTEL_TXT is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
+# CONFIG_INTEL_TXT is not set
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Thu Jan 21 14:44:36 2010	(r14965)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Thu Jan 21 14:49:34 2010	(r14966)
@@ -20,11 +20,11 @@
 ## file: arch/x86/Kconfig.cpu
 ##
 ## choice: Processor family
-CONFIG_GENERIC_CPU=y
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
 ## end choice
 
 ##