summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/015-remove-rt2x00-options.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-14 22:53:54 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-09-14 22:53:54 +0000
commite30b799cdce79c4fe33c8bd09d2f289baf788382 (patch)
tree0bfc5f31cc4ea54f7253c14f510eac831f1495d0 /package/mac80211/patches/015-remove-rt2x00-options.patch
parent872d5928d93dcbb73d86a06bfe3981cbd3e35baf (diff)
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23061 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/015-remove-rt2x00-options.patch')
-rw-r--r--package/mac80211/patches/015-remove-rt2x00-options.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/015-remove-rt2x00-options.patch b/package/mac80211/patches/015-remove-rt2x00-options.patch
index 9cc04d0ad..31b4a653f 100644
--- 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
-@@ -268,12 +268,12 @@ CONFIG_RTL8180=m
+@@ -271,12 +271,12 @@ CONFIG_RTL8180=m
CONFIG_ADM8211=m
@@ -8,19 +8,19 @@
+# CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2400PCI=m
CONFIG_RT2500PCI=m
- ifneq ($(CONFIG_CRC_CCITT),)
+ ifdef 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
-@@ -382,7 +382,7 @@ CONFIG_RT2800USB_RT30XX=y
+@@ -391,7 +391,7 @@ CONFIG_RT2800USB_RT30XX=y
CONFIG_RT2800USB_RT35XX=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