From a2ae7c66fefac5dedb47e0a9b67c2e42d3d493d3 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Sun, 29 May 2011 20:16:43 +0400
Subject: [PATCH] --- yaml --- r: 274775 b: refs/heads/master c:
 adaf2a5d0887f9a317eca8550e59b0c92876c64f h: refs/heads/master i:   274773:
 efa82ca428c65347d4000e8295cc071270fbd296   274771:
 29fc1d9ffec3c0c1b3149d1be969edfcdd6dfd10   274767:
 e590b503a26fa481d61cb20d2bf32c458114fb77 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/devices/sst25l.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2c508d536019..77e4349b5163 100644
--- 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
index 83e80c65d6e7..52eb92edde93 100644
--- 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;