aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-08-27 17:14:09 +0000
committerLuka Perkov <luka@openwrt.org>2014-08-27 17:14:09 +0000
commitef2c284ed1589da05eddbbd22ff7f0fefd3cf6cf (patch)
treea09fbf34eed477e6d774a7c7521a3f27dec89adb /target
parentd0d3be5d8287ff737cfe4381c44706f1d8f7b881 (diff)
downloadupstream-ef2c284ed1589da05eddbbd22ff7f0fefd3cf6cf.tar.gz
upstream-ef2c284ed1589da05eddbbd22ff7f0fefd3cf6cf.tar.bz2
upstream-ef2c284ed1589da05eddbbd22ff7f0fefd3cf6cf.zip
kirkwood: refresh kernel config
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42314 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/kirkwood/config-3.144
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/kirkwood/config-3.14 b/target/linux/kirkwood/config-3.14
index 530b3c8f93..809d4218f6 100644
--- a/target/linux/kirkwood/config-3.14
+++ b/target/linux/kirkwood/config-3.14
@@ -11,6 +11,7 @@ CONFIG_ARCH_NR_GPIO=0
CONFIG_ARCH_REQUIRE_GPIOLIB=y
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
@@ -180,7 +181,6 @@ CONFIG_LZO_DECOMPRESS=y
# CONFIG_MACH_TS219 is not set
# CONFIG_MACH_TS41X is not set
CONFIG_MDIO_BOARDINFO=y
-# CONFIG_MLX5_CORE is not set
CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_MVSDIO=y
@@ -215,7 +215,6 @@ CONFIG_NET_DSA_MV88E6XXX=y
CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_RX_BUSY_POLL=y
CONFIG_NLS=y
CONFIG_NO_BOOTMEM=y
CONFIG_OF=y
@@ -299,7 +298,6 @@ CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_BCJ=y
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ZBOOT_ROM_TEXT=0x0
-# CONFIG_ZBUD is not set
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA_FLAG=0