mtd, ubi, ubifs: resync with Linux-3.14

[u-boot] / include / linux / mtd / concat.h

diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h
index c92b4ddc9be01ac3c1c4a08a0982024c524bb79d..195a4a5426b6b928b40bbe62dd3fafae708a0fd4 100644 (file)
--- a/include/linux/mtd/concat.h
+++ b/include/linux/mtd/concat.h
@@ -12,7 +12,11 @@
 struct mtd_info *mtd_concat_create(
     struct mtd_info *subdev[],  /* subdevices to concatenate */
     int num_devs,               /* number of subdevices      */
+#ifndef __UBOOT__
     const char *name);          /* name for the new device   */
+#else
+    char *name);          /* name for the new device   */
+#endif
 
 void mtd_concat_destroy(struct mtd_info *mtd);