From: John Crispin <john@openwrt.org>
Date: Wed, 11 Jun 2014 13:00:17 +0000 (+0000)
Subject: kernel: make sure the new UBIBLOCK symbol does not break builds
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e9f664c87974600ab5f0f1612a03548e7785e85f;p=openwrt%2Fstaging%2Flinusw.git

kernel: make sure the new UBIBLOCK symbol does not break builds

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41134
---

diff --git a/target/linux/at91/config-default b/target/linux/at91/config-default
index 966cf9afc9..e1c90a10d3 100644
--- a/target/linux/at91/config-default
+++ b/target/linux/at91/config-default
@@ -256,3 +256,4 @@ CONFIG_ZBOOT_ROM_TEXT=0
 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.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
diff --git a/target/linux/kirkwood/config-3.10 b/target/linux/kirkwood/config-3.10
index d6606d39ce..3e68c713ab 100644
--- a/target/linux/kirkwood/config-3.10
+++ b/target/linux/kirkwood/config-3.10
@@ -285,3 +285,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/kirkwood/config-3.14 b/target/linux/kirkwood/config-3.14
index 381ce759dc..750726c0da 100644
--- a/target/linux/kirkwood/config-3.14
+++ b/target/linux/kirkwood/config-3.14
@@ -302,3 +302,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/lantiq/xrx200/config-default b/target/linux/lantiq/xrx200/config-default
index 4550431ee4..0696aaba58 100644
--- a/target/linux/lantiq/xrx200/config-default
+++ b/target/linux/lantiq/xrx200/config-default
@@ -58,3 +58,4 @@ CONFIG_USB_SUPPORT=y
 CONFIG_XRX200_PHY_FW=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/lantiq/xway/config-default b/target/linux/lantiq/xway/config-default
index 684fb0005a..cf325f38a3 100644
--- a/target/linux/lantiq/xway/config-default
+++ b/target/linux/lantiq/xway/config-default
@@ -57,3 +57,4 @@ CONFIG_USB_SUPPORT=y
 # CONFIG_XRX200_PHY_FW is not set
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
+# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/malta/config-3.10 b/target/linux/malta/config-3.10
index 67d280f058..d652bb2df0 100644
--- a/target/linux/malta/config-3.10
+++ b/target/linux/malta/config-3.10
@@ -266,3 +266,4 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VXFS_FS=y
 # CONFIG_WATCHDOG is not set
 CONFIG_XPS=y
+# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/malta/config-3.12 b/target/linux/malta/config-3.12
index 67d280f058..d652bb2df0 100644
--- a/target/linux/malta/config-3.12
+++ b/target/linux/malta/config-3.12
@@ -266,3 +266,4 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VXFS_FS=y
 # CONFIG_WATCHDOG is not set
 CONFIG_XPS=y
+# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/mpc83xx/config-3.8 b/target/linux/mpc83xx/config-3.8
index 9ea4309cfa..b9d6ee4300 100644
--- a/target/linux/mpc83xx/config-3.8
+++ b/target/linux/mpc83xx/config-3.8
@@ -406,3 +406,4 @@ CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_XATTR=y
 CONFIG_YAFFS_YAFFS1=y
 CONFIG_YAFFS_YAFFS2=y
+# CONFIG_MTD_UBI_BLOCK is not set
diff --git a/target/linux/xburst/config-3.10 b/target/linux/xburst/config-3.10
index f7e6dc9c93..c265bc8cac 100644
--- a/target/linux/xburst/config-3.10
+++ b/target/linux/xburst/config-3.10
@@ -330,3 +330,4 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
+# CONFIG_MTD_UBI_BLOCK is not set