---

yaml --- r: 274781 b: refs/heads/master c: caf32f4 h: refs/heads/master i: 274779: 669008c v: v3
git-mirror · Sep 11, 2011 · c2d2f7e · c2d2f7e
1 parent abb624a
commit c2d2f7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2108c3bc632962422b7929e715ed6bbb837ac25c
+refs/heads/master: caf32f4e8ca84ed1b0570176770f7209e7c304fe
diff --git a/trunk/drivers/mtd/nand/bcm_umi_nand.c b/trunk/drivers/mtd/nand/bcm_umi_nand.c
@@ -52,8 +52,6 @@
 static const __devinitconst char gBanner[] = KERN_INFO \
 	"BCM UMI MTD NAND Driver: 1.00\n";
 
-const char *part_probes[] = { "cmdlinepart", NULL };
-
 #if NAND_ECC_BCH
 static uint8_t scan_ff_pattern[] = { 0xff };
 
@@ -496,9 +494,8 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
 		struct mtd_partition *partition_info;
 
 		board_mtd->name = "bcm_umi-nand";
-		nr_partitions =
-		    parse_mtd_partitions(board_mtd, part_probes,
-					 &partition_info, 0);
+		nr_partitions = parse_mtd_partitions(board_mtd, NULL,
+						     &partition_info, 0);
 
 		if (nr_partitions <= 0) {
 			printk(KERN_ERR "BCM UMI NAND: Too few partitions - %d\n",