summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2014-07-15 16:08:42 +0200
committerTom Rini <trini@ti.com>2014-08-25 19:25:56 -0400
commitddf7bcfa6c5a1d9647046c18e4945f0b0686aec5 (patch)
tree5aacb15745d27f8a2a9565b4441f4170817841cc /drivers
parentff94bc40af3481d47546595ba73c136de6af6929 (diff)
downloadu-boot-imx-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.zip
u-boot-imx-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.tar.gz
u-boot-imx-ddf7bcfa6c5a1d9647046c18e4945f0b0686aec5.tar.bz2
mtd, ubi, ubifs: update for the sync with linux v3.14
while playing with the new mtd/ubi/ubifs sync, found some small updates for it: - add del_mtd_partition() to include/linux/mtd/mtd - mtd: add a debug_printf - remove some not used functions Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/mtdcore.c2
-rw-r--r--drivers/mtd/mtdpart.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 796ac07..bdb94ce 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -476,6 +476,8 @@ int add_mtd_device(struct mtd_info *mtd)
the notifier, since we hold the mtd_table_mutex */
list_for_each_entry(not, &mtd_notifiers, list)
not->add(mtd);
+#else
+ pr_debug("mtd: Giving out device %d to %s\n", i, mtd->name);
#endif
mutex_unlock(&mtd_table_mutex);
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index d20b857..3dc47b3 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -572,6 +572,7 @@ out_register:
return slave;
}
+#ifndef __UBOOT__
int mtd_add_partition(struct mtd_info *master, const char *name,
long long offset, long long length)
{
@@ -651,6 +652,7 @@ int mtd_del_partition(struct mtd_info *master, int partno)
return ret;
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
+#endif
/*
* This function, given a master MTD object and a partition table, creates