generic/4.0: upgrade to 4.0-rc6

[openwrt/openwrt.git] / target / linux / generic / config-3.14

diff --git a/target/linux/generic/config-3.14 b/target/linux/generic/config-3.14
index 6e70ba77bdc158870b9524c64810f1208ac33fbd..150c6e3b5c835119ac49e88ae532f0888a51395b 100644 (file)
--- a/target/linux/generic/config-3.14
+++ b/target/linux/generic/config-3.14
@@ -159,6 +159,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NOMADIK is not set
 # CONFIG_ARCH_NUC93X is not set
@@ -1119,7 +1120,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GREENASIA_FF is not set
 # CONFIG_HAMACHI is not set
-CONFIG_HAMRADIO=y
+# CONFIG_HAMRADIO is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_HAVE_AOUT is not set
@@ -1939,6 +1940,7 @@ CONFIG_MII=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_FPU_EMU is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_O32_FP64_SUPPORT is not set
 # CONFIG_MIPS_SEAD3 is not set
 # CONFIG_MIPS_SIM is not set
 CONFIG_MISC_DEVICES=y
@@ -2131,9 +2133,11 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_FIRMWARE is not set
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
+# CONFIG_MTD_SPLIT_FIT_FW is not set
 # CONFIG_MTD_SPLIT_LZMA_FW is not set
 # CONFIG_MTD_SPLIT_SEAMA_FW is not set
 CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
+CONFIG_MTD_SPLIT_SUPPORT=y
 # CONFIG_MTD_SPLIT_TRX_FW is not set
 # CONFIG_MTD_SPLIT_TPLINK_FW is not set
 # CONFIG_MTD_SPLIT_UIMAGE_FW is not set
@@ -2560,6 +2564,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OMAP_USB3 is not set
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPENVSWITCH is not set
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 # CONFIG_ORION_WATCHDOG is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_OVERLAYFS_FS=y