Commit f6d773cd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

parents d0e1e88d bcb628d5

drivers/net/wireless/Kconfig

+16 −124
Original line number Diff line number Diff line
@@ -16,118 +16,9 @@ menuconfig WLAN 


if WLAN



menuconfig WLAN_PRE80211

	bool "Wireless LAN (pre-802.11)"

	depends on NETDEVICES

	---help---

	  Say Y if you have any pre-802.11 wireless LAN hardware.



	  This option does not affect the kernel build, it only

	  lets you choose drivers.



config STRIP

	tristate "STRIP (Metricom starmode radio IP)"

	depends on INET && WLAN_PRE80211

	select WIRELESS_EXT

	---help---

	  Say Y if you have a Metricom radio and intend to use Starmode Radio

	  IP. STRIP is a radio protocol developed for the MosquitoNet project

	  to send Internet traffic using Metricom radios.  Metricom radios are

	  small, battery powered, 100kbit/sec packet radio transceivers, about

	  the size and weight of a cellular telephone. (You may also have heard

	  them called "Metricom modems" but we avoid the term "modem" because

	  it misleads many people into thinking that you can plug a Metricom

	  modem into a phone line and use it as a modem.)



	  You can use STRIP on any Linux machine with a serial port, although

	  it is obviously most useful for people with laptop computers. If you

	  think you might get a Metricom radio in the future, there is no harm

	  in saying Y to STRIP now, except that it makes the kernel a bit

	  bigger.



	  To compile this as a module, choose M here: the module will be

	  called strip.



config ARLAN

	tristate "Aironet Arlan 655 & IC2200 DS support"

	depends on ISA && !64BIT && WLAN_PRE80211

	select WIRELESS_EXT

	---help---

	  Aironet makes Arlan, a class of wireless LAN adapters. These use the

	  www.Telxon.com chip, which is also used on several similar cards.

	  This driver is tested on the 655 and IC2200 series cards. Look at

	  <http://www.ylenurme.ee/~elmer/655/> for the latest information.



	  The driver is built as two modules, arlan and arlan-proc. The latter

	  is the /proc interface and is not needed most of time.



	  On some computers the card ends up in non-valid state after some

	  time. Use a ping-reset script to clear it.



config WAVELAN

	tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"

	depends on ISA && WLAN_PRE80211

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	---help---

	  The Lucent WaveLAN (formerly NCR and AT&T; or DEC RoamAbout DS) is

	  a Radio LAN (wireless Ethernet-like Local Area Network) using the

	  radio frequencies 900 MHz and 2.4 GHz.



	  If you want to use an ISA WaveLAN card under Linux, say Y and read

	  the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>. Some more specific

	  information is contained in

	  <file:Documentation/networking/wavelan.txt> and in the source code

	  <file:drivers/net/wireless/wavelan.p.h>.



	  You will also need the wireless tools package available from

	  <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.

	  Please read the man pages contained therein.



	  To compile this driver as a module, choose M here: the module will be

	  called wavelan.



config PCMCIA_WAVELAN

	tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"

	depends on PCMCIA && WLAN_PRE80211

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV

	help

	  Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA

	  (PC-card) wireless Ethernet networking card to your computer.  This

	  driver is for the non-IEEE-802.11 Wavelan cards.



	  To compile this driver as a module, choose M here: the module will be

	  called wavelan_cs.  If unsure, say N.



config PCMCIA_NETWAVE

	tristate "Xircom Netwave AirSurfer Pcmcia wireless support"

	depends on PCMCIA && WLAN_PRE80211

	select WIRELESS_EXT

	select WEXT_PRIV

	help

	  Say Y here if you intend to attach this type of PCMCIA (PC-card)

	  wireless Ethernet networking card to your computer.



	  To compile this driver as a module, choose M here: the module will be

	  called netwave_cs.  If unsure, say N.





menuconfig WLAN_80211

	bool "Wireless LAN (IEEE 802.11)"

	depends on NETDEVICES

	---help---

	  Say Y if you have any 802.11 wireless LAN hardware.



	  This option does not affect the kernel build, it only

	  lets you choose drivers.



config PCMCIA_RAYCS

	tristate "Aviator/Raytheon 2.4GHz wireless support"

	depends on PCMCIA && WLAN_80211

	depends on PCMCIA

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV
@@ -142,7 +33,7 @@ config PCMCIA_RAYCS 


config LIBERTAS_THINFIRM

	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"

	depends on WLAN_80211 && MAC80211

	depends on MAC80211

	select FW_LOADER

	---help---

	  A library for Marvell Libertas 8xxx devices using thinfirm.
@@ -155,7 +46,7 @@ config LIBERTAS_THINFIRM_USB 


config AIRO

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

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

	depends on ISA_DMA_API && (PCI || BROKEN)

	select WIRELESS_EXT

	select CRYPTO

	select WEXT_SPY
@@ -175,7 +66,7 @@ config AIRO 


config ATMEL

      tristate "Atmel at76c50x chipset  802.11b support"

      depends on (PCI || PCMCIA) && WLAN_80211

      depends on (PCI || PCMCIA)

      select WIRELESS_EXT

      select WEXT_PRIV

      select FW_LOADER
@@ -210,7 +101,7 @@ config PCMCIA_ATMEL 


config AT76C50X_USB

        tristate "Atmel at76c503/at76c505/at76c505a USB cards"

        depends on MAC80211 && WLAN_80211 && USB

        depends on MAC80211 && USB

        select FW_LOADER

        ---help---

          Enable support for USB Wireless devices using Atmel at76c503,
@@ -218,8 +109,9 @@ config AT76C50X_USB 


config AIRO_CS

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

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

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

	select WIRELESS_EXT

	select WEXT_SPY

	select CRYPTO

	select CRYPTO_AES

	---help---
@@ -238,7 +130,7 @@ config AIRO_CS 


config PCMCIA_WL3501

	tristate "Planet WL3501 PCMCIA cards"

	depends on EXPERIMENTAL && PCMCIA && WLAN_80211

	depends on EXPERIMENTAL && PCMCIA

	select WIRELESS_EXT

	select WEXT_SPY

	help
@@ -248,7 +140,7 @@ config PCMCIA_WL3501 


config PRISM54

	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'

	depends on PCI && EXPERIMENTAL && WLAN_80211

	depends on PCI && EXPERIMENTAL

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV
@@ -272,7 +164,7 @@ config PRISM54 


config USB_ZD1201

	tristate "USB ZD1201 based Wireless device support"

	depends on USB && WLAN_80211

	depends on USB

	select WIRELESS_EXT

	select WEXT_PRIV

	select FW_LOADER
@@ -291,7 +183,7 @@ config USB_ZD1201 


config USB_NET_RNDIS_WLAN

	tristate "Wireless RNDIS USB support"

	depends on USB && WLAN_80211 && EXPERIMENTAL

	depends on USB && EXPERIMENTAL

	depends on CFG80211

	select USB_USBNET

	select USB_NET_CDCETHER
@@ -319,7 +211,7 @@ config USB_NET_RNDIS_WLAN 


config RTL8180

	tristate "Realtek 8180/8185 PCI support"

	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL

	depends on MAC80211 && PCI && EXPERIMENTAL

	select EEPROM_93CX6

	---help---

	  This is a driver for RTL8180 and RTL8185 based cards.
@@ -375,7 +267,7 @@ config RTL8180 


config RTL8187

	tristate "Realtek 8187 and 8187B USB support"

	depends on MAC80211 && USB && WLAN_80211

	depends on MAC80211 && USB

	select EEPROM_93CX6

	---help---

	  This is a driver for RTL8187 and RTL8187B based cards.
@@ -404,7 +296,7 @@ config RTL8187_LEDS 


config ADM8211

	tristate "ADMtek ADM8211 support"

	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL

	depends on MAC80211 && PCI && EXPERIMENTAL

	select CRC32

	select EEPROM_93CX6

	---help---
@@ -431,7 +323,7 @@ config ADM8211 


config MAC80211_HWSIM

	tristate "Simulated radio testing tool for mac80211"

	depends on MAC80211 && WLAN_80211

	depends on MAC80211

	---help---

	  This driver is a developer testing tool that can be used to test

	  IEEE 802.11 networking stack (mac80211) functionality. This is not
@@ -444,7 +336,7 @@ config MAC80211_HWSIM 


config MWL8K

	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"

	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL

	depends on MAC80211 && PCI && EXPERIMENTAL

	---help---

	  This driver supports Marvell TOPDOG 802.11 wireless cards.

drivers/net/wireless/Makefile

+0 −10
Original line number Diff line number Diff line
@@ -5,16 +5,6 @@ 
obj-$(CONFIG_IPW2100) += ipw2x00/

obj-$(CONFIG_IPW2200) += ipw2x00/



obj-$(CONFIG_STRIP) += strip.o

obj-$(CONFIG_ARLAN) += arlan.o 



arlan-objs := arlan-main.o arlan-proc.o



# Obsolete cards

obj-$(CONFIG_WAVELAN)		+= wavelan.o

obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave_cs.o

obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan_cs.o



obj-$(CONFIG_HERMES)		+= orinoco/



obj-$(CONFIG_AIRO)		+= airo.o

drivers/net/wireless/ath/Kconfig

+0 −1
Original line number Diff line number Diff line 
menuconfig ATH_COMMON

	tristate "Atheros Wireless Cards"

	depends on WLAN_80211

	depends on CFG80211

	---help---

	  This will enable the support for the Atheros wireless drivers.

drivers/net/wireless/ath/ar9170/Kconfig

+1 −1
Original line number Diff line number Diff line 
config AR9170_USB

	tristate "Atheros AR9170 802.11n USB support"

	depends on USB && MAC80211 && WLAN_80211

	depends on USB && MAC80211

	select FW_LOADER

	help

	  This is a driver for the Atheros "otus" 802.11n USB devices.

drivers/net/wireless/ath/ath5k/Kconfig

+1 −1
Original line number Diff line number Diff line 
config ATH5K

	tristate "Atheros 5xxx wireless cards support"

	depends on PCI && MAC80211 && WLAN_80211

	depends on PCI && MAC80211

	select MAC80211_LEDS

	select LEDS_CLASS

	select NEW_LEDS