summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.34
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-15 11:04:53 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-15 11:04:53 +0000
commitc1a68ed433f7fa2a9e1ffed0433f75dd11ba681c (patch)
tree60f4867c3a8d60bad7b830c7791a795ffba6fe5e /target/linux/generic-2.6/patches-2.6.34
parent86154153a622f87b6cc6209e355351975c82efb4 (diff)
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 'target/linux/generic-2.6/patches-2.6.34')
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch10
1 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
index 98dde2a3c8..3176dcb4d8 100644
--- a/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch
@@ -1,6 +1,14 @@
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
-@@ -49,7 +49,7 @@ config SSB_PCIHOST
+@@ -29,6 +29,7 @@ config SSB_SPROM
+ config SSB_BLOCKIO
+ bool
+ depends on SSB
++ default y
+
+ config SSB_PCIHOST_POSSIBLE
+ bool
+@@ -49,7 +50,7 @@ config SSB_PCIHOST
config SSB_B43_PCI_BRIDGE
bool
depends on SSB_PCIHOST