On Mon, Aug 17, 2009 at 7:27 PM, Luis R. Rodriguez<lrodriguez@xxxxxxxxxxx> wrote: > Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> > --- > drivers/net/wireless/Kconfig | 40 ++++++++++++++++++++-------------------- > 1 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig > index b489d9c..b03035f 100644 > --- a/drivers/net/wireless/Kconfig > +++ b/drivers/net/wireless/Kconfig > @@ -213,6 +213,26 @@ config AIRO > > The driver can be compiled as a module and will be named "airo". > > +config AIRO_CS > + tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" > + depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211 > + select WIRELESS_EXT > + select CRYPTO > + select CRYPTO_AES > + ---help--- > + This is the standard Linux driver to support Cisco/Aironet PCMCIA > + 802.11 wireless cards. This driver is the same as the Aironet > + driver part of the Linux Pcmcia package. > + It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X > + - with or without encryption) as well as card before the Cisco > + acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also > + supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom > + 802.11b cards. > + > + This driver support both the standard Linux Wireless Extensions > + and Cisco proprietary API, so both the Linux Wireless Tools and the > + Cisco Linux utilities can be used to configure the card. > + > config ATMEL_80211 > bool "Atmel" > depends on WLAN_80211 > @@ -265,26 +285,6 @@ config AT76C50X_USB > > endif # ATMEL_80211 > > -config AIRO_CS > - tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" > - depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211 > - select WIRELESS_EXT > - select CRYPTO > - select CRYPTO_AES > - ---help--- > - This is the standard Linux driver to support Cisco/Aironet PCMCIA > - 802.11 wireless cards. This driver is the same as the Aironet > - driver part of the Linux Pcmcia package. > - It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X > - - with or without encryption) as well as card before the Cisco > - acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also > - supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom > - 802.11b cards. > - > - This driver support both the standard Linux Wireless Extensions > - and Cisco proprietary API, so both the Linux Wireless Tools and the > - Cisco Linux utilities can be used to configure the card. > - > config PCMCIA_WL3501 > tristate "Planet WL3501 PCMCIA cards" > depends on EXPERIMENTAL && PCMCIA && WLAN_80211 > -- > 1.6.2.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > AIRO_CS has an identity crisis again... -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
