diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-15 11:04:53 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-05-15 11:04:53 +0000 |
| commit | 6a4f17a03625c72b2d2835be84e6c971ed611930 (patch) | |
| tree | 60f4867c3a8d60bad7b830c7791a795ffba6fe5e /package/mac80211/patches/010-no_pcmcia.patch | |
| parent | 2923f9f5a61f62f459d7242bb147336f4e8416bd (diff) | |
| download | upstream-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/010-no_pcmcia.patch')
| -rw-r--r-- | package/mac80211/patches/010-no_pcmcia.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/package/mac80211/patches/010-no_pcmcia.patch b/package/mac80211/patches/010-no_pcmcia.patch index 0826df4f39..8d5e5e9557 100644 --- a/package/mac80211/patches/010-no_pcmcia.patch +++ b/package/mac80211/patches/010-no_pcmcia.patch @@ -6,10 +6,10 @@ CONFIG_USB=y - CONFIG_PCMCIA=y +# CONFIG_PCMCIA=y - CONFIG_SSB=m else include $(KLIB_BUILD)/.config -@@ -181,7 +181,7 @@ CONFIG_B43=m + endif +@@ -180,7 +180,7 @@ CONFIG_B43=m CONFIG_B43_HWRNG=y CONFIG_B43_PCI_AUTOSELECT=y ifneq ($(CONFIG_PCMCIA),) @@ -18,12 +18,3 @@ endif CONFIG_B43_LEDS=y CONFIG_B43_PHY_LP=y -@@ -233,7 +233,7 @@ CONFIG_SSB_BLOCKIO=y - CONFIG_SSB_PCIHOST=y - CONFIG_SSB_B43_PCI_BRIDGE=y - ifneq ($(CONFIG_PCMCIA),) --CONFIG_SSB_PCMCIAHOST=y -+# CONFIG_SSB_PCMCIAHOST=y - endif - # CONFIG_SSB_DEBUG=y - CONFIG_SSB_DRIVER_PCICORE=y |