diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-09-14 22:53:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-09-14 22:53:54 +0000 |
| commit | fc7fbe83490df97271a50ded051aa312a6260e51 (patch) | |
| tree | c75075ffb981ba2906a4b36a465adcea6858031f /package/mac80211/patches/015-remove-rt2x00-options.patch | |
| parent | 9c2cfd7a1bfc67cc12e08160d9808f39fd68e318 (diff) | |
| download | upstream-fc7fbe83490df97271a50ded051aa312a6260e51.tar.gz upstream-fc7fbe83490df97271a50ded051aa312a6260e51.tar.bz2 upstream-fc7fbe83490df97271a50ded051aa312a6260e51.zip | |
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
SVN-Revision: 23061
Diffstat (limited to 'package/mac80211/patches/015-remove-rt2x00-options.patch')
| -rw-r--r-- | package/mac80211/patches/015-remove-rt2x00-options.patch | 10 |
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 9cc04d0adb..31b4a653f2 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 |