[kernel] r13757 - in dists/trunk/linux-2.6/debian/config: . arm armel mips mipsel

[Bastian Blank]

Author: waldi
Date: Wed Jun 10 10:38:19 2009
New Revision: 13757

Log:
debian/config: Reorder.

Modified:
   dists/trunk/linux-2.6/debian/config/arm/config.orion5x
   dists/trunk/linux-2.6/debian/config/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt

Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Wed Jun 10 10:37:34 2009	(r13756)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x	Wed Jun 10 10:38:19 2009	(r13757)
@@ -328,11 +328,11 @@
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
 CONFIG_MV643XX_ETH=m
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
 # CONFIG_NETDEV_10000 is not set
+# CONFIG_BNX2X is not set
 CONFIG_NETCONSOLE=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile	Wed Jun 10 10:37:34 2009	(r13756)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile	Wed Jun 10 10:38:19 2009	(r13757)
@@ -275,8 +275,8 @@
 # CONFIG_IP1000 is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
 # CONFIG_NETDEV_10000 is not set
+# CONFIG_BNX2X is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_FC is not set

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Wed Jun 10 10:37:34 2009	(r13756)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Wed Jun 10 10:38:19 2009	(r13757)
@@ -345,11 +345,11 @@
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
 CONFIG_MV643XX_ETH=m
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
 # CONFIG_NETDEV_10000 is not set
+# CONFIG_BNX2X is not set
 CONFIG_NETCONSOLE=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Jun 10 10:37:34 2009	(r13756)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Jun 10 10:38:19 2009	(r13757)
@@ -262,8 +262,8 @@
 ##
 ## file: drivers/dma/Kconfig
 ##
-# CONFIG_DMATEST is not set
 CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
 
 ##
 ## file: drivers/edac/Kconfig
@@ -1270,7 +1270,6 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_BNX2X=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
@@ -1295,6 +1294,7 @@
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
 CONFIG_QLGE=m
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2825,12 +2825,12 @@
 CONFIG_NET_NS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_EMBEDDED is not set
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_STRIP_ASM_SYMS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -2895,9 +2895,9 @@
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 # CONFIG_POWER_TRACER is not set
 # CONFIG_STACK_TRACER is not set
+# CONFIG_HW_BRANCH_TRACER is not set
 # CONFIG_KMEMTRACE is not set
 # CONFIG_WORKQUEUE_TRACER is not set
-# CONFIG_HW_BRANCH_TRACER is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Wed Jun 10 10:37:34 2009	(r13756)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Wed Jun 10 10:38:19 2009	(r13757)
@@ -405,10 +405,10 @@
 # CONFIG_SKY2 is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
+# CONFIG_BNX2X is not set
 
 ##
 ## file: drivers/net/arcnet/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed Jun 10 10:37:34 2009	(r13756)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed Jun 10 10:38:19 2009	(r13757)
@@ -510,10 +510,10 @@
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-# CONFIG_BNX2X is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
+# CONFIG_BNX2X is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m