Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index f630552..9def1e5 100644 (file)
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -59,7 +59,6 @@ config RT2800PCI
        select RT2800_LIB
        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
@@ -74,17 +73,13 @@ config RT2800PCI
 if RT2800PCI
 
 config RT2800PCI_RT33XX
-       bool "rt2800pci - Include support for rt33xx devices (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       default n
+       bool "rt2800pci - Include support for rt33xx devices"
+       default y
        ---help---
          This adds support for rt33xx wireless chipset family to the
          rt2800pci driver.
          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 devices (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@ -98,17 +93,14 @@ config RT2800PCI_RT35XX
          intended for testers and developers.
 
 config RT2800PCI_RT53XX
-       bool "rt2800-pci - Include support for rt53xx devices (EXPERIMENTAL)"
+       bool "rt2800pci - Include support for rt53xx devices (EXPERIMENTAL)"
        depends on EXPERIMENTAL
-       default n
+       default y
        ---help---
          This adds support for rt53xx wireless chipset family to the
          rt2800pci driver.
          Supported chips: RT5390
 
-         Support for these devices is non-functional at the moment and is
-         intended for testers and developers.
-
 endif
 
 config RT2500USB
@@ -140,7 +132,6 @@ config RT2800USB
        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
@@ -153,17 +144,13 @@ config RT2800USB
 if RT2800USB
 
 config RT2800USB_RT33XX
-       bool "rt2800usb - Include support for rt33xx devices (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       default n
+       bool "rt2800usb - Include support for rt33xx devices"
+       default y
        ---help---
          This adds support for rt33xx wireless chipset family to the
          rt2800usb driver.
          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 devices (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@ -176,6 +163,15 @@ 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
+       default y
+       ---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
@@ -207,9 +203,6 @@ config RT2X00_LIB_USB
 config RT2X00_LIB
        tristate
 
-config RT2X00_LIB_HT
-       boolean
-
 config RT2X00_LIB_FIRMWARE
        boolean
        select FW_LOADER