iwlwifi: Use HW acceleration decryption by default

[safe/jmp/linux-2.6] / drivers / net / wireless / rt2x00 / Kconfig

diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 51adb2f..a1e3938 100644 (file)
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -5,31 +5,28 @@ config RT2X00
          This will enable the experimental support for the Ralink drivers,
          developed in the rt2x00 project <http://rt2x00.serialmonkey.com>.
 
-         These drivers will make use of the Devicescape ieee80211 stack.
+         These drivers will make use of the mac80211 stack.
 
          When building one of the individual drivers, the rt2x00 library
          will also be created. That library (when the driver is built as
          a module) will be called "rt2x00lib.ko".
 
+if RT2X00
+
 config RT2X00_LIB
        tristate
-       depends on RT2X00
 
 config RT2X00_LIB_PCI
        tristate
-       depends on RT2X00
        select RT2X00_LIB
 
 config RT2X00_LIB_USB
        tristate
-       depends on RT2X00
        select RT2X00_LIB
 
 config RT2X00_LIB_FIRMWARE
        boolean
        depends on RT2X00_LIB
-       select CRC_CCITT
-       select CRC_ITU_T
        select FW_LOADER
 
 config RT2X00_LIB_RFKILL
@@ -41,13 +38,10 @@ config RT2X00_LIB_RFKILL
 config RT2X00_LIB_LEDS
        boolean
        depends on RT2X00_LIB
-       select LEDS_CLASS
-       select LEDS_TRIGGERS
-       select MAC80211_LEDS
 
 config RT2400PCI
        tristate "Ralink rt2400 pci/pcmcia support"
-       depends on RT2X00 && PCI
+       depends on PCI
        select RT2X00_LIB_PCI
        select EEPROM_93CX6
        ---help---
@@ -66,14 +60,14 @@ config RT2400PCI_RFKILL
 
 config RT2400PCI_LEDS
        bool "RT2400 leds support"
-       depends on RT2400PCI
+       depends on RT2400PCI && LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
          This adds support for led triggers provided my mac80211.
 
 config RT2500PCI
        tristate "Ralink rt2500 pci/pcmcia support"
-       depends on RT2X00 && PCI
+       depends on PCI
        select RT2X00_LIB_PCI
        select EEPROM_93CX6
        ---help---
@@ -92,16 +86,17 @@ config RT2500PCI_RFKILL
 
 config RT2500PCI_LEDS
        bool "RT2500 leds support"
-       depends on RT2500PCI
+       depends on RT2500PCI && LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
          This adds support for led triggers provided my mac80211.
 
 config RT61PCI
        tristate "Ralink rt61 pci/pcmcia support"
-       depends on RT2X00 && PCI
+       depends on PCI
        select RT2X00_LIB_PCI
        select RT2X00_LIB_FIRMWARE
+       select CRC_ITU_T
        select EEPROM_93CX6
        ---help---
          This is an experimental driver for the Ralink rt61 wireless chip.
@@ -119,14 +114,14 @@ config RT61PCI_RFKILL
 
 config RT61PCI_LEDS
        bool "RT61 leds support"
-       depends on RT61PCI
+       depends on RT61PCI && LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
          This adds support for led triggers provided my mac80211.
 
 config RT2500USB
        tristate "Ralink rt2500 usb support"
-       depends on RT2X00 && USB
+       depends on USB
        select RT2X00_LIB_USB
        ---help---
          This is an experimental driver for the Ralink rt2500 wireless chip.
@@ -135,16 +130,17 @@ config RT2500USB
 
 config RT2500USB_LEDS
        bool "RT2500 leds support"
-       depends on RT2500USB
+       depends on RT2500USB && LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
          This adds support for led triggers provided my mac80211.
 
 config RT73USB
        tristate "Ralink rt73 usb support"
-       depends on RT2X00 && USB
+       depends on USB
        select RT2X00_LIB_USB
        select RT2X00_LIB_FIRMWARE
+       select CRC_ITU_T
        ---help---
          This is an experimental driver for the Ralink rt73 wireless chip.
 
@@ -152,7 +148,7 @@ config RT73USB
 
 config RT73USB_LEDS
        bool "RT73 leds support"
-       depends on RT73USB
+       depends on RT73USB && LEDS_CLASS
        select RT2X00_LIB_LEDS
        ---help---
          This adds support for led triggers provided my mac80211.
@@ -171,3 +167,4 @@ config RT2X00_DEBUG
        ---help---
          Enable debugging output for all rt2x00 modules
 
+endif