Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / drivers / net / wireless / p54 / Kconfig

diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig
index 0e344ac..b45d6a4 100644 (file)
--- a/drivers/net/wireless/p54/Kconfig
+++ b/drivers/net/wireless/p54/Kconfig
@@ -1,9 +1,10 @@
 config P54_COMMON
        tristate "Softmac Prism54 support"
-       depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
+       depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
+       select FW_LOADER
        ---help---
-         This is common code for isl38xx based cards.
-         This module does nothing by itself - the USB/PCI frontends
+         This is common code for isl38xx/stlc45xx based modules.
+         This module does nothing by itself - the USB/PCI/SPI front-ends
          also need to be enabled in order to support any devices.
 
          These devices require softmac firmware which can be found at
@@ -17,31 +18,6 @@ config P54_USB
        select CRC32
        ---help---
          This driver is for USB isl38xx based wireless cards.
-         These are USB based adapters found in devices such as:
-
-         3COM 3CRWE254G72
-         SMC 2862W-G
-         Accton 802.11g WN4501 USB
-         Siemens Gigaset USB
-         Netgear WG121
-         Netgear WG111
-         Medion 40900, Roper Europe
-         Shuttle PN15, Airvast WM168g, IOGear GWU513
-         Linksys WUSB54G
-         Linksys WUSB54G Portable
-         DLink DWL-G120 Spinnaker
-         DLink DWL-G122
-         Belkin F5D7050 ver 1000
-         Cohiba Proto board
-         SMC 2862W-G version 2
-         U.S. Robotics U5 802.11g Adapter
-         FUJITSU E-5400 USB D1700
-         Sagem XG703A
-         DLink DWL-G120 Cohiba
-         Spinnaker Proto board
-         Linksys WUSB54AG
-         Inventel UR054G
-         Spinnaker DUT
 
          These devices require softmac firmware which can be found at
          http://prism54.org/
@@ -71,3 +47,8 @@ config P54_SPI
          Nokia's N800/N810 Portable Internet Tablet.
 
          If you choose to build a module, it'll be called p54spi.
+
+config P54_LEDS
+       bool
+       depends on P54_COMMON && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = P54_COMMON)
+       default y