From d07aa1d84b26f0442fb727dbb992c9694a3cef8b Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 10 Jun 2009 10:38:19 +0000 Subject: [PATCH] debian/config: Reorder. svn path=/dists/trunk/linux-2.6/; revision=13757 --- debian/config/arm/config.orion5x | 2 +- debian/config/arm/config.versatile | 2 +- debian/config/armel/config.kirkwood | 2 +- debian/config/config | 8 ++++---- debian/config/mips/config.r5k-ip32 | 2 +- debian/config/mipsel/config.r5k-cobalt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x index a99f131a4..b55ff7028 100644 --- a/debian/config/arm/config.orion5x +++ b/debian/config/arm/config.orion5x @@ -328,11 +328,11 @@ CONFIG_NETDEV_1000=y # 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 ## diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 4d77c540f..9c6ffb1f3 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -275,8 +275,8 @@ CONFIG_NETDEV_1000=y # 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 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 6c7a4000a..cf0c36650 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -345,11 +345,11 @@ CONFIG_NETDEV_1000=y # 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 ## diff --git a/debian/config/config b/debian/config/config index 29d38dac1..842f54bc0 100644 --- a/debian/config/config +++ b/debian/config/config @@ -262,8 +262,8 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y ## ## 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_SKY2=m 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_NIU=m 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_PID_NS=y 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_BOOT_TRACER=y # 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 diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 8af3fa65c..e4124e8e1 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -405,10 +405,10 @@ CONFIG_E100=m # 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 diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 9d69d490d..1bb513445 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -510,10 +510,10 @@ CONFIG_VIA_RHINE=m # 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