[kernel] r9814 - 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
Tue Nov 27 16:19:12 UTC 2007 

Author: maks
Date: Tue Nov 27 16:19:11 2007
New Revision: 9814

Log:
centralize NETDEV_10000: IXGB, S2IO
arm seems quite inconsistent in enabling/disabling those network drivers
as bonus point kill duplicate tokenring mips/mipsel driver variables


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/arm/config.footbridge
   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/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/powerpc/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	Tue Nov 27 16:19:11 2007
@@ -500,8 +500,6 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_WAVELAN=m

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	Tue Nov 27 16:19:11 2007
@@ -464,8 +464,6 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m

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	Tue Nov 27 16:19:11 2007
@@ -665,7 +665,6 @@
 #
 # Ethernet (10000 Mbit)
 #
-CONFIG_CHELSIO_T1=m
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
 

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	Tue Nov 27 16:19:11 2007
@@ -696,7 +696,6 @@
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
-CONFIG_MYRI10GE=m
 
 #
 # Token Ring devices

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	Tue Nov 27 16:19:11 2007
@@ -1553,18 +1553,21 @@
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
 CONFIG_NETDEV_10000=y
-CONFIG_CHELSIO_T1_NAPI=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T1_NAPI=y
 CONFIG_CHELSIO_T3=m
 CONFIG_IXGBE=m
+CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
+CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
+
 CONFIG_TEHUTI=m
 CONFIG_IBMOL=m
 CONFIG_TMS380TR=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	Tue Nov 27 16:19:11 2007
@@ -318,8 +318,6 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
 # CONFIG_TR is not set
 CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set

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	Tue Nov 27 16:19:11 2007
@@ -590,8 +590,6 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_ARLAN=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	Tue Nov 27 16:19:11 2007
@@ -45,8 +45,6 @@
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m

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	Tue Nov 27 16:19:11 2007
@@ -1226,19 +1226,6 @@
 CONFIG_QLA3XXX=m
 
 #
-# Ethernet (10000 Mbit)
-#
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
-
-#
 # Wireless LAN (non-hamradio)
 #
 CONFIG_WLAN_PRE80211=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	Tue Nov 27 16:19:11 2007
@@ -1299,22 +1299,8 @@
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-CONFIG_NETDEV_10000=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
-CONFIG_CHELSIO_T3=m
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
+
 CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
 
 #
 # Wireless LAN

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	Tue Nov 27 16:19:11 2007
@@ -1226,19 +1226,6 @@
 CONFIG_QLA3XXX=m
 
 #
-# Ethernet (10000 Mbit)
-#
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
-
-#
 # Wireless LAN (non-hamradio)
 #
 CONFIG_WLAN_PRE80211=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	Tue Nov 27 16:19:11 2007
@@ -1299,22 +1299,8 @@
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-CONFIG_NETDEV_10000=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T1_NAPI=y
-CONFIG_CHELSIO_T3=m
-CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
-CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
+
 CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
 
 #
 # Wireless LAN

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	Tue Nov 27 16:19:11 2007
@@ -350,8 +350,6 @@
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
 CONFIG_MV643XX_ETH=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m

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	Tue Nov 27 16:19:11 2007
@@ -43,7 +43,6 @@
 CONFIG_FB_PM2=y
 # CONFIG_I2C_VIAPRO is not set
 CONFIG_USB_OHCI_HCD=m
-CONFIG_IXGB=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SPARC32_COMPAT=y
 # CONFIG_BLK_DEV_AMD74XX is not set
@@ -54,7 +53,6 @@
 # CONFIG_SPARC64_PAGE_SIZE_64KB is not set
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
-CONFIG_S2IO=m
 # CONFIG_SND_RTCTIMER is not set
 # CONFIG_HID_FF is not set
 CONFIG_I2C_ALGOPCA=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	Tue Nov 27 16:19:11 2007
@@ -43,7 +43,6 @@
 CONFIG_FB_PM2=y
 # CONFIG_I2C_VIAPRO is not set
 CONFIG_USB_OHCI_HCD=m
-CONFIG_IXGB=m
 CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SPARC32_COMPAT=y
 # CONFIG_BLK_DEV_AMD74XX is not set
@@ -54,7 +53,6 @@
 # CONFIG_SPARC64_PAGE_SIZE_64KB is not set
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
-CONFIG_S2IO=m
 # CONFIG_SND_RTCTIMER is not set
 # CONFIG_HID_FF is not set
 CONFIG_I2C_ALGOPCA=m

More information about the Kernel-svn-changes mailing list