summaryrefslogtreecommitdiff
path: root/target/linux
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
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')
-rw-r--r--target/linux/generic-2.6/config-2.6.301
-rw-r--r--target/linux/generic-2.6/config-2.6.311
-rw-r--r--target/linux/generic-2.6/config-2.6.321
-rw-r--r--target/linux/generic-2.6/config-2.6.331
-rw-r--r--target/linux/generic-2.6/config-2.6.341
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.34/974-ssb_b43_default_on.patch10
10 files changed, 45 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 79cdf7653f..6ae6df02f7 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -2167,7 +2167,6 @@ CONFIG_SQUASHFS_LZMA=y
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
# CONFIG_SQUASHFS_VMALLOC is not set
CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB is not set
# CONFIG_SSB_PCMCIAHOST is not set
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 6017db91d4..7c1630c337 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -2174,7 +2174,6 @@ CONFIG_SQUASHFS_LZMA=y
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
# CONFIG_SQUASHFS_VMALLOC is not set
CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB is not set
# CONFIG_SSB_PCMCIAHOST is not set
diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index 41a4ef3b07..65aa9404f2 100644
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -2289,7 +2289,6 @@ CONFIG_SQUASHFS_LZMA=y
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
# CONFIG_SQUASHFS_VMALLOC is not set
CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB is not set
# CONFIG_SSB_PCMCIAHOST is not set
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index c5b127a5ac..8b70c90c9a 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -2317,7 +2317,6 @@ CONFIG_SQUASHFS_LZMA=y
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
# CONFIG_SQUASHFS_VMALLOC is not set
CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB is not set
# CONFIG_SSB_PCMCIAHOST is not set
diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
index 9c68880336..af59fcef66 100644
--- a/target/linux/generic-2.6/config-2.6.34
+++ b/target/linux/generic-2.6/config-2.6.34
@@ -2373,7 +2373,6 @@ CONFIG_SQUASHFS_LZMA=y
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
# CONFIG_SQUASHFS_VMALLOC is not set
CONFIG_SQUASHFS=y
-# CONFIG_SSB_BLOCKIO is not set
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB is not set
# CONFIG_SSB_PCMCIAHOST is not set
diff --git a/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch
index 98dde2a3c8..3176dcb4d8 100644
--- a/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/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
diff --git a/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch
index 98dde2a3c8..3176dcb4d8 100644
--- a/target/linux/generic-2.6/patches-2.6.31/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/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
diff --git a/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch
index 98dde2a3c8..3176dcb4d8 100644
--- a/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/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
diff --git a/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch
index 98dde2a3c8..3176dcb4d8 100644
--- a/target/linux/generic-2.6/patches-2.6.33/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/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
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