[kernel] r13043 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc
Maximilian Attems
maks at alioth.debian.org
Mon Mar 9 09:59:03 UTC 2009
Author: maks
Date: Mon Mar 9 09:59:02 2009
New Revision: 13043
Log:
topconfig centralize drivers/net step 1 NETDEV_1000
most of the drivers are anyway in topconfig add those that aren't :)
special treat sparc only for MYRI_SBUS, don't allow it to unset
bunch of them to reset them afterwards.
also various *_NAPI are gone, default anyway.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/amd64/config.amd64
dists/trunk/linux-2.6/debian/config/arm/config.footbridge
dists/trunk/linux-2.6/debian/config/arm/config.iop32x
dists/trunk/linux-2.6/debian/config/arm/config.versatile
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/i386/config
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/sparc/config
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Mon Mar 9 09:59:02 2009
@@ -774,16 +774,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_DE600=m
CONFIG_DE620=m
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Mon Mar 9 09:59:02 2009
@@ -918,15 +918,6 @@
CONFIG_ATP=m
CONFIG_DE600=m
CONFIG_DE620=m
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_FDDI=y
CONFIG_SKFP=m
Modified: dists/trunk/linux-2.6/debian/config/amd64/config.amd64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config.amd64 (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config.amd64 Mon Mar 9 09:59:02 2009
@@ -34,11 +34,6 @@
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
##
-## file: drivers/net/Kconfig
-##
-CONFIG_R8169_VLAN=y
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB_MATROX_G=y
Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Mon Mar 9 09:59:02 2009
@@ -658,9 +658,6 @@
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
-# CONFIG_R8169_VLAN is not set
-CONFIG_SIS190=m
-CONFIG_SKGE=m
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Mon Mar 9 09:59:02 2009
@@ -518,10 +518,6 @@
# CONFIG_DM9000 is not set
# CONFIG_HP100 is not set
# CONFIG_NET_PCI is not set
-CONFIG_E1000=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
##
## file: drivers/net/appletalk/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile Mon Mar 9 09:59:02 2009
@@ -279,28 +279,9 @@
CONFIG_SC92031=m
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_E1000E=m
# CONFIG_IP1000 is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
# CONFIG_NETDEV_10000 is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config (original)
+++ dists/trunk/linux-2.6/debian/config/config Mon Mar 9 09:59:02 2009
@@ -1204,19 +1204,27 @@
CONFIG_NETDEV_1000=y
CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_E1000_NAPI=y
+CONFIG_DL2K=m
+CONFIG_E1000=m
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
CONFIG_E1000E=m
CONFIG_IP1000=m
CONFIG_IGB=m
# CONFIG_IGB_LRO is not set
CONFIG_IGB_DCA=y
-CONFIG_R8169_NAPI=y
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_R8169_VLAN=y
CONFIG_SIS190=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKY2=m
# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
CONFIG_QLA3XXX=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
@@ -1225,15 +1233,12 @@
CONFIG_NETDEV_10000=y
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
CONFIG_CHELSIO_T3=m
CONFIG_ENIC=m
CONFIG_IXGBE=m
CONFIG_IXGBE_DCA=y
CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
CONFIG_NETXEN_NIC=m
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Mon Mar 9 09:59:02 2009
@@ -299,16 +299,6 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
CONFIG_PLIP=m
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config Mon Mar 9 09:59:02 2009
@@ -1103,16 +1103,6 @@
CONFIG_ATP=m
CONFIG_DE600=m
CONFIG_DE620=m
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_FDDI=y
CONFIG_SKFP=m
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Mon Mar 9 09:59:02 2009
@@ -492,16 +492,6 @@
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
CONFIG_FDDI=y
CONFIG_SKFP=m
# CONFIG_HIPPI is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Mon Mar 9 09:59:02 2009
@@ -952,25 +952,6 @@
CONFIG_NET_POCKET=y
CONFIG_DE600=m
CONFIG_DE620=m
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_QLA3XXX=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Mon Mar 9 09:59:02 2009
@@ -1169,26 +1169,6 @@
CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Mon Mar 9 09:59:02 2009
@@ -405,7 +405,6 @@
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
-CONFIG_R8169=m
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Mon Mar 9 09:59:02 2009
@@ -558,22 +558,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
-CONFIG_SB1250_MAC=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Mon Mar 9 09:59:02 2009
@@ -559,22 +559,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
-CONFIG_SB1250_MAC=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Mon Mar 9 09:59:02 2009
@@ -951,25 +951,6 @@
CONFIG_NET_POCKET=y
CONFIG_DE600=m
CONFIG_DE620=m
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_QLA3XXX=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Mon Mar 9 09:59:02 2009
@@ -1169,26 +1169,6 @@
CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_NAPI=y
-CONFIG_R8169_VLAN=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a Mon Mar 9 09:59:02 2009
@@ -558,22 +558,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
-CONFIG_SB1250_MAC=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Mon Mar 9 09:59:02 2009
@@ -558,22 +558,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
# CONFIG_LAN_SAA9730 is not set
# CONFIG_NET_POCKET is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
-CONFIG_SB1250_MAC=y
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-CONFIG_SKY2=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Mon Mar 9 09:59:02 2009
@@ -550,17 +550,6 @@
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_MV643XX_ETH=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Mon Mar 9 09:59:02 2009
@@ -128,10 +128,7 @@
CONFIG_SUNBMAC=m
CONFIG_SUNQE=m
CONFIG_SUNVNET=m
-# CONFIG_HP100 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_R8169 is not set
-CONFIG_BNX2=m
+CONFIG_MYRI_SBUS=m
# CONFIG_HIPPI is not set
CONFIG_PLIP=m
CONFIG_NET_FC=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 Mon Mar 9 09:59:02 2009
@@ -239,14 +239,6 @@
CONFIG_SUNDANCE_MMIO=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_MYRI_SBUS=m
-CONFIG_NS83820=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
CONFIG_FDDI=y
CONFIG_SKFP=m
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Mon Mar 9 09:59:02 2009
@@ -242,14 +242,6 @@
CONFIG_SUNDANCE_MMIO=y
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_MYRI_SBUS=m
-CONFIG_NS83820=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
CONFIG_FDDI=y
CONFIG_SKFP=m
More information about the Kernel-svn-changes
mailing list