aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/005-disable_ssb_build.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-10-09 15:48:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-10-09 15:48:03 +0000
commitadfeb00e5a06d9ea3eb67564e2ccf2022ffdffe6 (patch)
tree4109f2d0bf85e19c62b8c86012b23e4b4e308516 /package/mac80211/patches/005-disable_ssb_build.patch
parente80e75321fa78976317f414025233a386aa189d0 (diff)
downloadupstream-adfeb00e5a06d9ea3eb67564e2ccf2022ffdffe6.tar.gz
upstream-adfeb00e5a06d9ea3eb67564e2ccf2022ffdffe6.tar.bz2
upstream-adfeb00e5a06d9ea3eb67564e2ccf2022ffdffe6.zip
mac80211: update to wireless-testing 2011-10-05 + pending patches
SVN-Revision: 28392
Diffstat (limited to 'package/mac80211/patches/005-disable_ssb_build.patch')
-rw-r--r--package/mac80211/patches/005-disable_ssb_build.patch6
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