Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / rt2x00 / Kconfig

diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 4396d4b9bfb9a68ed3c0d7b41a96a80963d30c9f..6f383cd684b009a1cee9663768759c32772a7cf1 100644 (file)
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -53,51 +53,41 @@ 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_PCI if PCI
+       select RT2X00_LIB_SOC if RALINK_RT288X || RALINK_RT305X
        select RT2X00_LIB_HT
        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"
-       default y
+config RT2800PCI_RT33XX
+       bool "rt2800pci - Include support for rt33xx devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       default n
        ---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
+         Supported chips: RT3390
 
          Support for these devices is non-functional at the moment and is
          intended for testers and developers.
 
 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
@@ -134,8 +124,8 @@ 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
@@ -143,30 +133,28 @@ config RT2800USB
        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"
-       default y
+config RT2800USB_RT33XX
+       bool "rt2800usb - Include support for rt33xx devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       default n
        ---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
+         Supported chips: RT3370
 
          Support for these devices is non-functional at the moment and is
          intended for testers and developers.
 
 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
@@ -180,9 +168,9 @@ 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.