aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-02-08 12:01:39 +0000
committerLuka Perkov <luka@openwrt.org>2015-02-08 12:01:39 +0000
commit7294b892dcc5e28a5180d6e9bb3fa9bb08e29493 (patch)
tree493c92b059496786a3e54d20120434f198a060f5 /target/linux/kirkwood
parentb9d513158ee3b0b16cd6b17eb50774be4ab33386 (diff)
downloadupstream-7294b892dcc5e28a5180d6e9bb3fa9bb08e29493.tar.gz
upstream-7294b892dcc5e28a5180d6e9bb3fa9bb08e29493.tar.bz2
upstream-7294b892dcc5e28a5180d6e9bb3fa9bb08e29493.zip
kirkwood: refresh kernel config
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44319
Diffstat (limited to 'target/linux/kirkwood')
-rw-r--r--target/linux/kirkwood/config-3.141
-rw-r--r--target/linux/kirkwood/config-3.183
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/kirkwood/config-3.14 b/target/linux/kirkwood/config-3.14
index f51018886c..ed5759df76 100644
--- a/target/linux/kirkwood/config-3.14
+++ b/target/linux/kirkwood/config-3.14
@@ -194,6 +194,7 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_ORION=y
# CONFIG_MTD_SM_COMMON is not set
+CONFIG_MTD_SPLIT_SUPPORT=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/kirkwood/config-3.18 b/target/linux/kirkwood/config-3.18
index c572a863dc..faab4dc4e5 100644
--- a/target/linux/kirkwood/config-3.18
+++ b/target/linux/kirkwood/config-3.18
@@ -171,7 +171,6 @@ CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_INET_LRO=y
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INTEL_SOC_PMIC is not set
CONFIG_IOMMU_HELPER=y
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_PIMSM_V1=y
@@ -207,6 +206,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_SPLIT_SUPPORT=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_BLOCK is not set
@@ -277,7 +277,6 @@ CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=y
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_RFKILL_REGULATOR is not set
CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_MV is not set
CONFIG_RWSEM_XCHGADD_ALGORITHM=y