[kernel] disable CONFIG_SSB_BLOCKIO by default until we fix it properly in mac80211

SVN-Revision: 15926

diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 3faa1f9c77f7348ff38b57459fb9dbfc310cef10..255080286bd181334bc6b62e12b7aa50c0fe81e9 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -182,7 +182,6 @@ CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SQUASHFS_VMALLOC=y
 CONFIG_SSB=y
-# CONFIG_SSB_BLOCKIO is not set
 CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index 8ebfa76e6bec153fa47db20be5324c33c438e67d..a26a59fc5f5d78c766084ecaf7c06a9878bbfd1a 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -1769,6 +1769,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
+# CONFIG_SSB_BLOCKIO is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB_DRIVER_MIPS is not set
 # CONFIG_SSB is not set

diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 0b32deba19f983c1707822539069729f833a0618..f66831599618f40da9735303683080d98f3b4cf5 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -1864,6 +1864,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # 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.30 b/target/linux/generic-2.6/config-2.6.30
index 538862fff32ff211c828c71483bba4d11b642c17..6e751e481a08dc31b9a3f2d164fc245e3ca7d2bf 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1949,6 +1949,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # 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