Commit 30db0ca8 authored by Kalle Valo's avatar Kalle Valo
Browse files

airo: move under cisco vendor directory 



Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d4a17304

drivers/net/wireless/Kconfig

+1 −42
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ menuconfig WLAN 
if WLAN



source "drivers/net/wireless/admtek/Kconfig"

source "drivers/net/wireless/cisco/Kconfig"



config PCMCIA_RAYCS

	tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -53,26 +54,6 @@ config LIBERTAS_THINFIRM_USB 
	---help---

	  A driver for Marvell Libertas 8388 USB devices using thinfirm.



config AIRO

	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"

	depends on CFG80211 && ISA_DMA_API && (PCI || BROKEN)

	select WIRELESS_EXT

	select CRYPTO

	select WEXT_SPY

	select WEXT_PRIV

	---help---

	  This is the standard Linux driver to support Cisco/Aironet ISA and

	  PCI 802.11 wireless cards.

	  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).



	  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.



	  The driver can be compiled as a module and will be named "airo".



config ATMEL

      tristate "Atmel at76c50x chipset  802.11b support"

      depends on CFG80211 && (PCI || PCMCIA)
@@ -116,28 +97,6 @@ config AT76C50X_USB 
          Enable support for USB Wireless devices using Atmel at76c503,

          at76c505 or at76c505a chips.



config AIRO_CS

	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"

	depends on CFG80211 && PCMCIA && (BROKEN || !M32R)

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	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 CFG80211 && PCMCIA

drivers/net/wireless/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -3,15 +3,13 @@ 
#



obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/

obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/



obj-$(CONFIG_IPW2100) += ipw2x00/

obj-$(CONFIG_IPW2200) += ipw2x00/



obj-$(CONFIG_HERMES)		+= orinoco/



obj-$(CONFIG_AIRO)		+= airo.o

obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o



obj-$(CONFIG_ATMEL)             += atmel.o

obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 

obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o

drivers/net/wireless/cisco/Kconfig

0 → 100644
+56 −0
Original line number Diff line number Diff line 
config WLAN_VENDOR_CISCO

	bool "Cisco devices"

	default y

	---help---

	  If you have a wireless card belonging to this class, say Y.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about  cards. If you say Y, you will be asked for

	  your specific card in the following questions.



if WLAN_VENDOR_CISCO



config AIRO

	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"

	depends on CFG80211 && ISA_DMA_API && (PCI || BROKEN)

	select WIRELESS_EXT

	select CRYPTO

	select WEXT_SPY

	select WEXT_PRIV

	---help---

	  This is the standard Linux driver to support Cisco/Aironet ISA and

	  PCI 802.11 wireless cards.

	  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).



	  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.



	  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 CFG80211 && PCMCIA && (BROKEN || !M32R)

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	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.



endif # WLAN_VENDOR_CISCO

drivers/net/wireless/cisco/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_AIRO)		+= airo.o

obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o