---

yaml --- r: 274887 b: refs/heads/master c: 3165f44 h: refs/heads/master i: 274885: cb2a2f3 274883: 7c4443f 274879: 3cf0aa4 v: v3
git-mirror · Sep 11, 2011 · 707c9fc · 707c9fc
1 parent 5d778b0
commit 707c9fc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return ret;
     }
-    EXPORT_SYMBOL_GPL(parse_mtd_partitions);
     int mtd_is_partition(struct mtd_info *mtd)
     {
@@ Expand Down @@