---

yaml --- r: 274775 b: refs/heads/master c: adaf2a5 h: refs/heads/master i: 274773: efa82ca 274771: 29fc1d9 274767: e590b50 v: v3
git-mirror · Sep 11, 2011 · a2ae7c6 · a2ae7c6
1 parent 9ec53b3
commit a2ae7c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fc468d5d55a0d9101e482ccb96b1b2879a73882
+refs/heads/master: adaf2a5d0887f9a317eca8550e59b0c92876c64f
diff --git a/trunk/drivers/mtd/devices/sst25l.c b/trunk/drivers/mtd/devices/sst25l.c
@@ -423,13 +423,7 @@ static int __devinit sst25l_probe(struct spi_device *spi)
 	      flash->mtd.numeraseregions);
 
 
-	if (mtd_has_cmdlinepart()) {
-		static const char *part_probes[] = {"cmdlinepart", NULL};
-
-		nr_parts = parse_mtd_partitions(&flash->mtd,
-						part_probes,
-						&parts, 0);
-	}
+	nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, 0);
 
 	if (nr_parts <= 0 && data && data->parts) {
 		parts = data->parts;