mac80211: update to wireless-testing 2011-04-06

[openwrt.git] / package / mac80211 / patches / 015-remove-rt2x00-options.patch

diff --git a/package/mac80211/patches/015-remove-rt2x00-options.patch b/package/mac80211/patches/015-remove-rt2x00-options.patch
index dd0bcdb..a03504f 100644 (file)
--- a/package/mac80211/patches/015-remove-rt2x00-options.patch
+++ b/package/mac80211/patches/015-remove-rt2x00-options.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
 --- a/config.mk
 +++ b/config.mk

-@@ -232,12 +232,12 @@ CONFIG_RTL8180=m
+@@ -304,7 +304,7 @@ CONFIG_RTL8180=m

  
  CONFIG_ADM8211=m
  
  
  CONFIG_ADM8211=m
  


@@ -8,19 +8,13 @@
 +# CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
  CONFIG_RT2500PCI=m
 +# CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
  CONFIG_RT2500PCI=m

- ifneq ($(CONFIG_CRC_CCITT),)
- CONFIG_RT2800PCI=m
--CONFIG_RT2800PCI_PCI=y
-+# CONFIG_RT2800PCI_PCI=y
- # CONFIG_RT2800PCI_RT30XX=y
- # CONFIG_RT2800PCI_RT35XX=y
- # CONFIG_RT2800PCI_SOC=y
-@@ -339,7 +339,7 @@ CONFIG_RT2800USB=m
+ ifdef CONFIG_CRC_CCITT
+@@ -444,7 +444,7 @@ CONFIG_RT2800USB=m

  # CONFIG_RT2800USB_RT35XX=y
  # CONFIG_RT2800USB_RT35XX=y

- # CONFIG_RT2800USB_UNKNOWN=y
- endif
+ CONFIG_RT2800USB_UNKNOWN=y
+ endif #CONFIG_CRC_CCITT

 -CONFIG_RT2X00_LIB_USB=m
 +# CONFIG_RT2X00_LIB_USB=m
  NEED_RT2X00=y
  # RT73USB requires firmware
 -CONFIG_RT2X00_LIB_USB=m
 +# CONFIG_RT2X00_LIB_USB=m
  NEED_RT2X00=y
  # RT73USB requires firmware

- ifneq ($(CONFIG_CRC_ITU_T),)
+ ifdef CONFIG_CRC_ITU_T