diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-10-09 15:48:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-10-09 15:48:03 +0000 |
commit | a14321df29a785ccfc836d94b0a7111cb1fbe70b (patch) | |
tree | c6db5ac8890ff67cb9546cae8dc635cf263707ec /package/mac80211/patches/005-disable_ssb_build.patch | |
parent | fcdec14820f8729b5ab1263e3b05a893b099a5c8 (diff) | |
download | upstream-a14321df29a785ccfc836d94b0a7111cb1fbe70b.tar.gz upstream-a14321df29a785ccfc836d94b0a7111cb1fbe70b.tar.bz2 upstream-a14321df29a785ccfc836d94b0a7111cb1fbe70b.zip |
mac80211: update to wireless-testing 2011-10-05 + pending patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/005-disable_ssb_build.patch')
-rw-r--r-- | package/mac80211/patches/005-disable_ssb_build.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch index d5578d173f..489d731b6e 100644 --- a/package/mac80211/patches/005-disable_ssb_build.patch +++ b/package/mac80211/patches/005-disable_ssb_build.patch @@ -18,7 +18,7 @@ else include $(KLIB_BUILD)/.config endif -@@ -316,7 +315,8 @@ CONFIG_IPW2200_QOS=y +@@ -315,7 +314,8 @@ CONFIG_IPW2200_QOS=y # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface endif #CONFIG_WIRELESS_EXT @@ -28,7 +28,7 @@ # Sonics Silicon Backplane CONFIG_SSB_SPROM=y -@@ -329,7 +329,7 @@ endif #CONFIG_PCMCIA +@@ -328,7 +328,7 @@ endif #CONFIG_PCMCIA # CONFIG_SSB_DEBUG=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_B43_SSB=y @@ -37,7 +37,7 @@ CONFIG_BCMA=m CONFIG_BCMA_BLOCKIO=y -@@ -538,7 +538,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv +@@ -537,7 +537,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv ifdef CONFIG_MMC |