diff options
| author | Heiko Schocher <hs@denx.de> | 2014-06-24 10:10:04 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-25 19:25:55 -0400 |
| commit | ff94bc40af3481d47546595ba73c136de6af6929 (patch) | |
| tree | 858119077e2ca8a992589185c36bd431e4a8c80e /include/linux/mtd/concat.h | |
| parent | 0c06db59836746c5caf397e642cd0f2bf1cc20a6 (diff) | |
| download | talos-obmc-uboot-ff94bc40af3481d47546595ba73c136de6af6929.tar.gz talos-obmc-uboot-ff94bc40af3481d47546595ba73c136de6af6929.zip | |
mtd, ubi, ubifs: resync with Linux-3.14
resync ubi subsystem with linux:
commit 455c6fdbd219161bd09b1165f11699d6d73de11c
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Mar 30 20:40:15 2014 -0700
Linux 3.14
A nice side effect of this, is we introduce UBI Fastmap support
to U-Boot.
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Joerg Krause <jkrause@posteo.de>
Diffstat (limited to 'include/linux/mtd/concat.h')
| -rw-r--r-- | include/linux/mtd/concat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h index c92b4ddc9b..195a4a5426 100644 --- 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); |
