kirkwood: switch to 4.4

[openwrt/svn-archive/archive.git] / target / linux / kirkwood / config-3.18

diff --git a/target/linux/kirkwood/config-3.18 b/target/linux/kirkwood/config-3.18
index 90c572d7a1fac8fb9a82f20edcd9a885962409aa..17b2819830b588308467256864c5a4a40f4540d9 100644 (file)
--- a/target/linux/kirkwood/config-3.18
+++ b/target/linux/kirkwood/config-3.18
@@ -169,7 +169,6 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IOMMU_HELPER=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IRQCHIP=y
@@ -190,6 +189,7 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_MACH_KIRKWOOD=y
 CONFIG_MACH_MVEBU_ANY=y
 # CONFIG_MACH_NETXBIG is not set
+CONFIG_MANGLE_BOOTARGS=y
 CONFIG_MDIO_BOARDINFO=y
 CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_MMC=y
@@ -204,7 +204,7 @@ CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_ORION=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_BLOCK is not set
+CONFIG_MTD_UBI_BLOCK=y
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096