---

yaml --- r: 274784 b: refs/heads/master c: 4e243a0 h: refs/heads/master v: v3
git-mirror · Sep 11, 2011 · 024f5b8 · 024f5b8
1 parent 8edb4c9
commit 024f5b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5987d3f45a3819985eb8f34203a5ca2604f08c06
+refs/heads/master: 4e243a04c39b009e42ff4a4682ed47b850997dc1
diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c
@@ -753,14 +753,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
 	if (ret < 0)
 		goto err_scan;
 
-	if (mtd_has_cmdlinepart()) {
-		static const char *probes[] __initconst = {
-			"cmdlinepart", NULL
-		};
-
-		mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes,
-						    &mtd_parts, 0);
-	}
+	mtd_parts_nb = parse_mtd_partitions(&info->mtd, NULL, &mtd_parts, 0);
 
 	if (mtd_parts_nb <= 0) {
 		mtd_parts = pdata->parts;