From: Florian Fainelli Date: Tue, 19 May 2009 18:15:19 +0000 (+0000) Subject: disable CONFIG_SSB_BLOCKIO by default until we fix it properly in mac80211 X-Git-Tag: reboot~23521 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1322e2721a14fe2db8513ff4c3eebc3d44196c7e;p=openwrt%2Fstaging%2Fxback.git 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 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