1 files changed, 43 insertions, 54 deletions

diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index eea1ef2f502b..b2f8b8fd4d2d 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -53,51 +53,36 @@ config RT61PCI
 
           When compiled as a module, this driver will be called rt61pci.
 
-config RT2800PCI_PCI
-        boolean
-        depends on PCI
-        default y
-
-config RT2800PCI_SOC
-        boolean
-        depends on RALINK_RT288X || RALINK_RT305X
-        default y
-
 config RT2800PCI
-        tristate "Ralink rt28xx/rt30xx/rt35xx (PCI/PCIe/PCMCIA) support (EXPERIMENTAL)"
-        depends on (RT2800PCI_PCI || RT2800PCI_SOC) && EXPERIMENTAL
+        tristate "Ralink rt27xx/rt28xx/rt30xx (PCI/PCIe/PCMCIA) support"
+        depends on PCI || RALINK_RT288X || RALINK_RT305X
         select RT2800_LIB
-        select RT2X00_LIB_PCI if RT2800PCI_PCI
-        select RT2X00_LIB_SOC if RT2800PCI_SOC
-        select RT2X00_LIB_HT
+        select RT2X00_LIB_PCI if PCI
+        select RT2X00_LIB_SOC if RALINK_RT288X || RALINK_RT305X
         select RT2X00_LIB_FIRMWARE
         select RT2X00_LIB_CRYPTO
         select CRC_CCITT
         select EEPROM_93CX6
         ---help---
-          This adds support for rt2800/rt3000/rt3500 wireless chipset family.
-          Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890 & RT3052
-
-          This driver is non-functional at the moment and is intended for
-          developers.
+          This adds support for rt27xx/rt28xx/rt30xx wireless chipset family.
+          Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890, RT3052,
+                           RT3090, RT3091 & RT3092
 
           When compiled as a module, this driver will be called "rt2800pci.ko".
 
 if RT2800PCI
 
-config RT2800PCI_RT30XX
-        bool "rt2800pci - Include support for rt30xx (PCI/PCIe/PCMCIA) devices"
+config RT2800PCI_RT33XX
+        bool "rt2800pci - Include support for rt33xx devices"
         default y
         ---help---
-          This adds support for rt30xx wireless chipset family to the
+          This adds support for rt33xx wireless chipset family to the
           rt2800pci driver.
-          Supported chips: RT3090, RT3091 & RT3092
-
-          Support for these devices is non-functional at the moment and is
-          intended for testers and developers.
+          Supported chips: RT3390
 
 config RT2800PCI_RT35XX
-        bool "rt2800pci - Include support for rt35xx (PCI/PCIe/PCMCIA) devices"
+        bool "rt2800pci - Include support for rt35xx devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
         default n
         ---help---
           This adds support for rt35xx wireless chipset family to the
@@ -107,6 +92,15 @@ config RT2800PCI_RT35XX
           Support for these devices is non-functional at the moment and is
           intended for testers and developers.
 
+config RT2800PCI_RT53XX
+       bool "rt2800pci - Include support for rt53xx devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       default y
+       ---help---
+         This adds support for rt53xx wireless chipset family to the
+         rt2800pci driver.
+         Supported chips: RT5390
+
 endif
 
 config RT2500USB
@@ -134,39 +128,32 @@ config RT73USB
           When compiled as a module, this driver will be called rt73usb.
 
 config RT2800USB
-        tristate "Ralink rt2800 (USB) support (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "Ralink rt27xx/rt28xx/rt30xx (USB) support"
+        depends on USB
         select RT2800_LIB
         select RT2X00_LIB_USB
-        select RT2X00_LIB_HT
         select RT2X00_LIB_FIRMWARE
         select RT2X00_LIB_CRYPTO
         select CRC_CCITT
         ---help---
-          This adds experimental support for rt2800 wireless chipset family.
-          Supported chips: RT2770, RT2870 & RT3070.
-
-          Known issues:
-          - support for RT2870 chips doesn't work with 802.11n APs yet
-          - support for RT3070 chips is non-functional at the moment
+          This adds support for rt27xx/rt28xx/rt30xx wireless chipset family.
+          Supported chips: RT2770, RT2870 & RT3070, RT3071 & RT3072
 
           When compiled as a module, this driver will be called "rt2800usb.ko".
 
 if RT2800USB
 
-config RT2800USB_RT30XX
-        bool "rt2800usb - Include support for rt30xx (USB) devices"
+config RT2800USB_RT33XX
+        bool "rt2800usb - Include support for rt33xx devices"
         default y
         ---help---
-          This adds support for rt30xx wireless chipset family to the
+          This adds support for rt33xx wireless chipset family to the
           rt2800usb driver.
-          Supported chips: RT3070, RT3071 & RT3072
-
-          Support for these devices is non-functional at the moment and is
-          intended for testers and developers.
+          Supported chips: RT3370
 
 config RT2800USB_RT35XX
-        bool "rt2800usb - Include support for rt35xx (USB) devices"
+        bool "rt2800usb - Include support for rt35xx devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
         default n
         ---help---
           This adds support for rt35xx wireless chipset family to the
@@ -176,13 +163,21 @@ config RT2800USB_RT35XX
           Support for these devices is non-functional at the moment and is
           intended for testers and developers.
 
+config RT2800USB_RT53XX
+       bool "rt2800usb - Include support for rt53xx devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       ---help---
+         This adds support for rt53xx wireless chipset family to the
+         rt2800pci driver.
+         Supported chips: RT5370
+
 config RT2800USB_UNKNOWN
         bool "rt2800usb - Include support for unknown (USB) devices"
         default n
         ---help---
-          This adds support for rt2800 family devices that are known to
-          have a rt2800 family chipset, but for which the exact chipset
-          is unknown.
+          This adds support for rt2800usb devices that are known to
+          have a rt28xx family compatible chipset, but for which the exact
+          chipset is unknown.
 
           Support status for these devices is unknown, and enabling these
           devices may or may not work.
@@ -207,9 +202,6 @@ config RT2X00_LIB_USB
 config RT2X00_LIB
         tristate
 
-config RT2X00_LIB_HT
-        boolean
-
 config RT2X00_LIB_FIRMWARE
         boolean
         select FW_LOADER
@@ -221,9 +213,6 @@ config RT2X00_LIB_LEDS
         boolean
         default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
 
-comment "rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00"
-        depends on RT2X00_LIB=y && LEDS_CLASS=m
-
 config RT2X00_LIB_DEBUGFS
         bool "Ralink debugfs support"
         depends on RT2X00_LIB && MAC80211_DEBUGFS