aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-11 13:00:17 +0000
committerJohn Crispin <john@openwrt.org>2014-06-11 13:00:17 +0000
commite9f664c87974600ab5f0f1612a03548e7785e85f (patch)
treeea931952bcecc7de75f8ac6ae4e5a88502ddc632 /target/linux/imx6
parent4096a110fb11327ae3ff7b4bf60a9e32d51eade9 (diff)
downloadupstream-e9f664c87974600ab5f0f1612a03548e7785e85f.tar.gz
upstream-e9f664c87974600ab5f0f1612a03548e7785e85f.tar.bz2
upstream-e9f664c87974600ab5f0f1612a03548e7785e85f.zip
kernel: make sure the new UBIBLOCK symbol does not break builds
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41134
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/config-3.101
-rw-r--r--target/linux/imx6/config-3.141
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index 3f189b85b4..d7cb3ff23d 100644
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -363,3 +363,4 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA_FLAG=0
+# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/imx6/config-3.14 b/target/linux/imx6/config-3.14
index de717ec238..3e4732efb8 100644
--- a/target/linux/imx6/config-3.14
+++ b/target/linux/imx6/config-3.14
@@ -364,3 +364,4 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DMA_FLAG=0
+# CONFIG_MTD_UBI_BLOCK is not set