aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/007-remove_misc_drivers.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-05-15 11:04:53 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-05-15 11:04:53 +0000
commit6a4f17a03625c72b2d2835be84e6c971ed611930 (patch)
tree60f4867c3a8d60bad7b830c7791a795ffba6fe5e /package/mac80211/patches/007-remove_misc_drivers.patch
parent2923f9f5a61f62f459d7242bb147336f4e8416bd (diff)
downloadupstream-6a4f17a03625c72b2d2835be84e6c971ed611930.tar.gz
upstream-6a4f17a03625c72b2d2835be84e6c971ed611930.tar.bz2
upstream-6a4f17a03625c72b2d2835be84e6c971ed611930.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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21449 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/007-remove_misc_drivers.patch')
-rw-r--r--package/mac80211/patches/007-remove_misc_drivers.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index e0b007fa4f..afd7161a2b 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,6 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -286,10 +286,10 @@ endif
+@@ -270,10 +270,10 @@ endif
CONFIG_MWL8K=m
# Ethernet drivers go here
@@ -15,7 +15,7 @@
CONFIG_HERMES=m
CONFIG_HERMES_CACHE_FW_ON_INIT=y
-@@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+@@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
CONFIG_USB_NET_COMPAT_CDCETHER=n
else