From 707c9fc42eda4990efa61c02e678b245f2b560cb Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 23 Jun 2011 15:23:08 +0400 Subject: [PATCH] --- yaml --- r: 274887 b: refs/heads/master c: 3165f44bcd4b987cbcc694af739ab955b561e05b h: refs/heads/master i: 274885: cb2a2f3773a3bd145155b29019c064500971a22d 274883: 7c4443f71d6cb5c478f2b7155b7a821b28a1061e 274879: 3cf0aa4519dcb682b7c6501dcf373ca6597cde17 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdcore.h | 3 +++ trunk/drivers/mtd/mtdpart.c | 1 - trunk/include/linux/mtd/partitions.h | 3 --- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3cfeaeb178a4..d0dd770c1300 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 050f01258319f2d2e66a131b7ddb6b5df5aa3af7 +refs/heads/master: 3165f44bcd4b987cbcc694af739ab955b561e05b diff --git a/trunk/drivers/mtd/mtdcore.h b/trunk/drivers/mtd/mtdcore.h index 0ed6126b4c1f..961a38408542 100644 --- a/trunk/drivers/mtd/mtdcore.h +++ b/trunk/drivers/mtd/mtdcore.h @@ -15,6 +15,9 @@ extern int del_mtd_device(struct mtd_info *mtd); extern int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); extern int del_mtd_partitions(struct mtd_info *); +extern int parse_mtd_partitions(struct mtd_info *master, const char **types, + struct mtd_partition **pparts, + struct mtd_part_parser_data *data); #define mtd_for_each_device(mtd) \ for ((mtd) = __mtd_next_device(0); \ diff --git a/trunk/drivers/mtd/mtdpart.c b/trunk/drivers/mtd/mtdpart.c index 9e8ee054135a..6997c6cdc471 100644 --- a/trunk/drivers/mtd/mtdpart.c +++ b/trunk/drivers/mtd/mtdpart.c @@ -778,7 +778,6 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types, } return ret; } -EXPORT_SYMBOL_GPL(parse_mtd_partitions); int mtd_is_partition(struct mtd_info *mtd) { diff --git a/trunk/include/linux/mtd/partitions.h b/trunk/include/linux/mtd/partitions.h index a8a961a8c8ff..c98d6b858c2c 100644 --- a/trunk/include/linux/mtd/partitions.h +++ b/trunk/include/linux/mtd/partitions.h @@ -78,9 +78,6 @@ struct mtd_part_parser { extern int register_mtd_parser(struct mtd_part_parser *parser); extern int deregister_mtd_parser(struct mtd_part_parser *parser); -extern int parse_mtd_partitions(struct mtd_info *master, const char **types, - struct mtd_partition **pparts, - struct mtd_part_parser_data *data); #define put_partition_parser(p) do { module_put((p)->owner); } while(0)