ath9k: setup correct skb priority for nullfunc

[deliverable/linux.git] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 465665237308a948a286e71ad93e15f6aa734f9d..8c8edaf1bba612ca3592fbab24077a2ec8b3f1e0 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -18,12 +18,20 @@ menuconfig WLAN
 if WLAN
 
 source "drivers/net/wireless/admtek/Kconfig"
+source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
+source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
+source "drivers/net/wireless/mediatek/Kconfig"
+source "drivers/net/wireless/ralink/Kconfig"
+source "drivers/net/wireless/realtek/Kconfig"
+source "drivers/net/wireless/rsi/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
+source "drivers/net/wireless/ti/Kconfig"
+source "drivers/net/wireless/zydas/Kconfig"
 
 config PCMCIA_RAYCS
        tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -50,44 +58,18 @@ config PCMCIA_WL3501
          It has basic support for Linux wireless extensions and initial
          micro support for ethtool.
 
-config PRISM54
-       tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
-       depends on PCI
-       select WIRELESS_EXT
-       select WEXT_SPY
-       select WEXT_PRIV
-       select FW_LOADER
-       ---help---
-         This enables support for FullMAC PCI/Cardbus prism54 devices. This
-         driver is now deprecated in favor for the SoftMAC driver, p54pci.
-         p54pci supports FullMAC PCI/Cardbus devices as well.
-
-         For more information refer to the p54 wiki:
-
-         http://wireless.kernel.org/en/users/Drivers/p54
-
-         Note: You need a motherboard with DMA support to use any of these cards
-
-         When built as module you get the module prism54
-
-config USB_ZD1201
-       tristate "USB ZD1201 based Wireless device support"
-       depends on CFG80211 && USB
-       select WIRELESS_EXT
-       select WEXT_PRIV
-       select FW_LOADER
+config MAC80211_HWSIM
+       tristate "Simulated radio testing tool for mac80211"
+       depends on MAC80211
        ---help---
-         Say Y if you want to use wireless LAN adapters based on the ZyDAS
-         ZD1201 chip.
-
-         This driver makes the adapter appear as a normal Ethernet interface,
-         typically on wlan0.
-
-         The zd1201 device requires external firmware to be loaded.
-         This can be found at http://linux-lc100020.sourceforge.net/
+         This driver is a developer testing tool that can be used to test
+         IEEE 802.11 networking stack (mac80211) functionality. This is not
+         needed for normal wireless LAN usage and is only for testing. See
+         Documentation/networking/mac80211_hwsim for more information on how
+         to use this tool.
 
-         To compile this driver as a module, choose M here: the
-         module will be called zd1201.
+         To compile this driver as a module, choose M here: the module will be
+         called mac80211_hwsim.  If unsure, say N.
 
 config USB_NET_RNDIS_WLAN
        tristate "Wireless RNDIS USB support"
@@ -118,40 +100,4 @@ config USB_NET_RNDIS_WLAN
 
          If you choose to build a module, it'll be called rndis_wlan.
 
-source "drivers/net/wireless/realtek/rtl818x/Kconfig"
-
-config MAC80211_HWSIM
-       tristate "Simulated radio testing tool for mac80211"
-       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
-         needed for normal wireless LAN usage and is only for testing. See
-         Documentation/networking/mac80211_hwsim for more information on how
-         to use this tool.
-
-         To compile this driver as a module, choose M here: the module will be
-         called mac80211_hwsim.  If unsure, say N.
-
-config MWL8K
-       tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
-       depends on MAC80211 && PCI
-       ---help---
-         This driver supports Marvell TOPDOG 802.11 wireless cards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called mwl8k.  If unsure, say N.
-
-source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/orinoco/Kconfig"
-source "drivers/net/wireless/p54/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
-source "drivers/net/wireless/mediatek/Kconfig"
-source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
-source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
-source "drivers/net/wireless/ti/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/rsi/Kconfig"
-
 endif # WLAN