[kernel] r8719 - in dists/trunk/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/i386 arch/ia64 arch/mips arch/mipsel arch/powerpc arch/s390

Maximilian Attems maks at alioth.debian.org
Tue May 22 15:22:32 UTC 2007 

Author: maks
Date: Tue May 22 15:22:31 2007
New Revision: 8719

Log:
unify token ring variable settings to toplevel config,
also enable newly added 3c359 and smctr.
sparc and hppa explicitly disable tokenring are they lazy?!
(more understable on some arm and mips configs)


Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Tue May 22 15:22:31 2007
@@ -565,14 +565,6 @@
 CONFIG_IXGB=m
 CONFIG_S2IO=m
 CONFIG_2BUFF_MODE=y
-CONFIG_TR=y
-CONFIG_IBMTR=m
-CONFIG_IBMOL=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_SKISA=m
-CONFIG_PROTEON=m
-CONFIG_ABYSS=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_WAVELAN=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Tue May 22 15:22:31 2007
@@ -508,11 +508,6 @@
 CONFIG_BNX2=m
 CONFIG_IXGB=m
 CONFIG_S2IO=m
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Tue May 22 15:22:31 2007
@@ -1074,6 +1074,21 @@
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 
+#
+# Token Ring devices
+#
+CONFIG_TR=y
+CONFIG_IBMTR=m
+CONFIG_IBMOL=m
+CONFIG_IBMLS=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_SKISA=m
+CONFIG_PROTEON=m
+CONFIG_ABYSS=m
+CONFIG_SMCTR=m
+
 CONFIG_HW_RANDOM=y
 CONFIG_SND_MIA=m
 CONFIG_MCS_FIR=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Tue May 22 15:22:31 2007
@@ -647,15 +647,6 @@
 CONFIG_BNX2=m
 CONFIG_IXGB=m
 CONFIG_S2IO=m
-CONFIG_TR=y
-CONFIG_IBMTR=m
-CONFIG_IBMOL=m
-CONFIG_IBMLS=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_SKISA=m
-CONFIG_PROTEON=m
-CONFIG_ABYSS=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_ARLAN=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Tue May 22 15:22:31 2007
@@ -474,10 +474,6 @@
 CONFIG_IXGB=m
 CONFIG_S2IO=m
 # CONFIG_2BUFF_MODE is not set
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_3C359=m
-# CONFIG_TMS380TR is not set
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta	Tue May 22 15:22:31 2007
@@ -1411,17 +1411,6 @@
 CONFIG_NETXEN_NIC=m
 
 #
-# Token Ring devices
-#
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_IBMLS=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-
-#
 # Wireless LAN (non-hamradio)
 #
 CONFIG_WLAN_PRE80211=y

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta	Tue May 22 15:22:31 2007
@@ -1412,17 +1412,6 @@
 CONFIG_NETXEN_NIC=m
 
 #
-# Token Ring devices
-#
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_IBMLS=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-
-#
 # Wireless LAN (non-hamradio)
 #
 CONFIG_WLAN_PRE80211=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Tue May 22 15:22:31 2007
@@ -422,12 +422,6 @@
 CONFIG_IXGB=m
 CONFIG_S2IO=m
 # CONFIG_2BUFF_MODE is not set
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_IBMLS=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
 CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	Tue May 22 15:22:31 2007
@@ -89,7 +89,6 @@
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_DUMMY is not set
-CONFIG_TR=y
 # CONFIG_NET_RADIO is not set
 # CONFIG_WAN is not set
 CONFIG_LCS=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue May 22 15:22:31 2007
@@ -17,11 +17,13 @@
   * Enable new wirless stack mac80211 and improved wireless conf api.
   * Enable new USB Touchscreen Driver on all configs with touchscreens.
   * Enable the newly added crypto algorythm: fcrypt, pcbc and camellia.
+  * Unify CONFIG_TR to toplevel config, also enable new drivers 3C359
+    and SMCTR.
 
   [ Martin Michlmayr ]
   * mipsel/r5k-cobalt: Use the new RTC system.
 
- -- maximilian attems <maks at debian.org>  Tue, 22 May 2007 15:40:13 +0200
+ -- maximilian attems <maks at debian.org>  Tue, 22 May 2007 17:22:01 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low

More information about the Kernel-svn-changes mailing list