mac80211: backport latest version from trunk (as of r28137)

[openwrt-10.03/.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 a9176ece5a79f29023f33b6ba6140049396c0aa7..e449c23ef80c85b2cb702d7262195e7f5d96f16e 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
-@@ -233,12 +233,12 @@ CONFIG_RTL8180=m
+@@ -330,7 +330,7 @@ CONFIG_RTL8180=m
  
  CONFIG_ADM8211=m
  
@@ -8,19 +8,13 @@
 +# 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
-@@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y
- CONFIG_RT2800USB_RT35XX=y
+ ifdef CONFIG_CRC_CCITT
+@@ -470,7 +470,7 @@ CONFIG_RT2800USB_RT35XX=y
+ # CONFIG_RT2800USB_RT53XX=y
  CONFIG_RT2800USB_UNKNOWN=y
- endif
+ endif #CONFIG_CRC_CCITT
 -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