aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-05-19 18:15:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-05-19 18:15:19 +0000
commit1322e2721a14fe2db8513ff4c3eebc3d44196c7e (patch)
tree0dae89cc689ad95d8fe646c55f636ee0a2de562e /target/linux
parent771a39277e667384b3462e47955e1c460bc41a84 (diff)
downloadupstream-1322e2721a14fe2db8513ff4c3eebc3d44196c7e.tar.gz
upstream-1322e2721a14fe2db8513ff4c3eebc3d44196c7e.tar.bz2
upstream-1322e2721a14fe2db8513ff4c3eebc3d44196c7e.zip
disable CONFIG_SSB_BLOCKIO by default until we fix it properly in mac80211
SVN-Revision: 15926
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/config-2.6.271
-rw-r--r--target/linux/generic-2.6/config-2.6.271
-rw-r--r--target/linux/generic-2.6/config-2.6.281
-rw-r--r--target/linux/generic-2.6/config-2.6.301
4 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 3faa1f9c77..255080286b 100644
--- 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 8ebfa76e6b..a26a59fc5f 100644
--- 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 0b32deba19..f668315996 100644
--- 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 538862fff3..6e751e481a 100644
--- 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