aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/015-remove-rt2x00-options.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-05-15 11:04:53 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-05-15 11:04:53 +0000
commitcfec944f426b948f8bd5ef81e402c81e29e3eb1c (patch)
tree98286029c58af347d1c905ab54172d36ddb175fb /package/mac80211/patches/015-remove-rt2x00-options.patch
parent01d8285e472e3103a11a6583d2c6c3ccf1acb198 (diff)
downloadupstream-cfec944f426b948f8bd5ef81e402c81e29e3eb1c.tar.gz
upstream-cfec944f426b948f8bd5ef81e402c81e29e3eb1c.tar.bz2
upstream-cfec944f426b948f8bd5ef81e402c81e29e3eb1c.zip
ssb: activate CONFIG_SSB_BLOCKIO in the kernel and not in compat-wireless.
Before this patch CONFIG_SSB_BLOCKIO was set to y in compat-wireless but the in kernel ssb system had it set to n, this causes an invalid pointer. b43 now needs CONFIG_SSB_BLOCKIO=y SVN-Revision: 21449
Diffstat (limited to 'package/mac80211/patches/015-remove-rt2x00-options.patch')
-rw-r--r--package/mac80211/patches/015-remove-rt2x00-options.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/015-remove-rt2x00-options.patch b/package/mac80211/patches/015-remove-rt2x00-options.patch
index e62192bdfa..dd0bcdb8bb 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
-@@ -248,12 +248,12 @@ CONFIG_RTL8180=m
+@@ -232,12 +232,12 @@ CONFIG_RTL8180=m
CONFIG_ADM8211=m
@@ -15,7 +15,7 @@
# CONFIG_RT2800PCI_RT30XX=y
# CONFIG_RT2800PCI_RT35XX=y
# CONFIG_RT2800PCI_SOC=y
-@@ -355,7 +355,7 @@ CONFIG_RT2800USB=m
+@@ -339,7 +339,7 @@ CONFIG_RT2800USB=m
# CONFIG_RT2800USB_RT35XX=y
# CONFIG_RT2800USB_UNKNOWN=y
endif