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
This commit is contained in:
Maximilian Attems 2007-05-22 15:22:31 +00:00
parent 8458713a76
commit a187104de6
10 changed files with 18 additions and 56 deletions

View File

@ -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

View File

@ -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

15
debian/arch/config vendored
View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)
#

View File

@ -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)
#

View File

@ -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

View File

@ -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

4
debian/changelog vendored
View File

@ -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 <maks@debian.org> Tue, 22 May 2007 15:40:13 +0200
-- maximilian attems <maks@debian.org> Tue, 22 May 2007 17:22:01 +0200
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low