merge latest mac80211 from trunk (as of r22038) to backfire

[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..6946948703d602f74e319002737b695ca6c96c10 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
+@@ -244,12 +244,12 @@ CONFIG_RTL8180=m
  
  CONFIG_ADM8211=m
  
@@ -15,7 +15,7 @@
  # CONFIG_RT2800PCI_RT30XX=y
  # CONFIG_RT2800PCI_RT35XX=y
  # CONFIG_RT2800PCI_SOC=y
-@@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y
+@@ -355,7 +355,7 @@ CONFIG_RT2800USB_RT30XX=y
  CONFIG_RT2800USB_RT35XX=y
  CONFIG_RT2800USB_UNKNOWN=y
  endif