---

yaml --- r: 252508 b: refs/heads/master c: 11b73c8 h: refs/heads/master v: v3
git-mirror · May 25, 2011 · 70abded · 70abded
1 parent c04d377
commit 70abded
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5671ab3f67a10f7234de21464391c20c1ef8ebb
+refs/heads/master: 11b73c8b10e58ae90c12e51be5531007e86a9c66
diff --git a/trunk/include/linux/mtd/partitions.h b/trunk/include/linux/mtd/partitions.h
@@ -73,9 +73,18 @@ extern int parse_mtd_partitions(struct mtd_info *master, const char **types,
 struct device;
 struct device_node;
 
+#ifdef CONFIG_MTD_OF_PARTS
 int __devinit of_mtd_parse_partitions(struct device *dev,
                                       struct device_node *node,
                                       struct mtd_partition **pparts);
+#else
+static inline int of_mtd_parse_partitions(struct device *dev,
+					  struct device_node *node,
+					  struct mtd_partition **pparts)
+{
+	return 0;
+}
+#endif
 
 #ifdef CONFIG_MTD_PARTITIONS
 static inline int mtd_has_partitions(void) { return 1; }