aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/005-disable_ssb_build.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-12-05 14:20:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-12-05 14:20:17 +0000
commitaa63f0bef6a965aa2248409ce0c094fed475b20b (patch)
tree1fb391b3ae38d7774a48c079b663a8f15c9031aa /package/mac80211/patches/005-disable_ssb_build.patch
parent4cc2b9bb06436a1a57fc3620ea62c4835f9b7d51 (diff)
downloadupstream-aa63f0bef6a965aa2248409ce0c094fed475b20b.tar.gz
upstream-aa63f0bef6a965aa2248409ce0c094fed475b20b.tar.bz2
upstream-aa63f0bef6a965aa2248409ce0c094fed475b20b.zip
mac80211: update to 2011-12-01
SVN-Revision: 29436
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 ac95769059..8e898145e6 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
-@@ -315,7 +314,8 @@ CONFIG_IPW2200_QOS=y
+@@ -354,7 +353,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
-@@ -328,7 +328,7 @@ endif #CONFIG_PCMCIA
+@@ -367,7 +367,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
-@@ -535,7 +535,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
+@@ -574,7 +574,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv
ifdef CONFIG_MMC