From a187104de67ace7b1df7b62bc065e2364468a9e2 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 22 May 2007 15:22:31 +0000 Subject: [PATCH] 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) svn path=/dists/trunk/linux-2.6/; revision=8719 --- debian/arch/alpha/config | 8 -------- debian/arch/amd64/config | 5 ----- debian/arch/config | 15 +++++++++++++++ debian/arch/i386/config | 9 --------- debian/arch/ia64/config | 4 ---- debian/arch/mips/config.4kc-malta | 11 ----------- debian/arch/mipsel/config.4kc-malta | 11 ----------- debian/arch/powerpc/config | 6 ------ debian/arch/s390/config | 1 - debian/changelog | 4 +++- 10 files changed, 18 insertions(+), 56 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 7d7b3e3a1..d743434d8 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -565,14 +565,6 @@ CONFIG_BNX2=m 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 diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 12323e1ae..a068e31ac 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -508,11 +508,6 @@ CONFIG_TIGON3=m 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 diff --git a/debian/arch/config b/debian/arch/config index dc6c9f923..0d28b2608 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -1074,6 +1074,21 @@ CONFIG_IXGB_NAPI=y 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 365c102d2..960271285 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -647,15 +647,6 @@ CONFIG_TIGON3=m 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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 0f9f1f3f9..9b1aab5f7 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -474,10 +474,6 @@ CONFIG_BNX2=m 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 diff --git a/debian/arch/mips/config.4kc-malta b/debian/arch/mips/config.4kc-malta index 58454abca..dab1a9a9e 100644 --- a/debian/arch/mips/config.4kc-malta +++ b/debian/arch/mips/config.4kc-malta @@ -1410,17 +1410,6 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m 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) # diff --git a/debian/arch/mipsel/config.4kc-malta b/debian/arch/mipsel/config.4kc-malta index 427b8d01b..c61e6fb14 100644 --- a/debian/arch/mipsel/config.4kc-malta +++ b/debian/arch/mipsel/config.4kc-malta @@ -1411,17 +1411,6 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m 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) # diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 6a2b5c651..0010f758e 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -422,12 +422,6 @@ CONFIG_MV643XX_ETH_1=y 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 diff --git a/debian/arch/s390/config b/debian/arch/s390/config index eb2e861d9..66e92d362 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -89,7 +89,6 @@ CONFIG_LLC=y # 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 diff --git a/debian/changelog b/debian/changelog index bf4c5ec8d..f09512a40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,11 +17,13 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low * 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 Tue, 22 May 2007 15:40:13 +0200 + -- maximilian attems Tue, 22 May 2007 17:22:01 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low