From b1e640309cba4e35db882c0960f86169cb0c88eb Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Sun, 29 May 2011 20:16:52 +0400
Subject: [PATCH] --- yaml --- r: 274782 b: refs/heads/master c:
 00205e831326f7fc22888de152b313c89a43a110 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mtd/nand/cmx270_nand.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe99ee167837..82b0d335387f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf32f4e8ca84ed1b0570176770f7209e7c304fe
+refs/heads/master: 00205e831326f7fc22888de152b313c89a43a110
diff --git a/trunk/drivers/mtd/nand/cmx270_nand.c b/trunk/drivers/mtd/nand/cmx270_nand.c
index 6fc043a30d1e..f8f5b7c0daf5 100644
--- a/trunk/drivers/mtd/nand/cmx270_nand.c
+++ b/trunk/drivers/mtd/nand/cmx270_nand.c
@@ -50,8 +50,6 @@ static struct mtd_partition partition_info[] = {
 };
 #define NUM_PARTITIONS (ARRAY_SIZE(partition_info))
 
-const char *part_probes[] = { "cmdlinepart", NULL };
-
 static u_char cmx270_read_byte(struct mtd_info *mtd)
 {
 	struct nand_chip *this = mtd->priv;
@@ -222,14 +220,13 @@ static int __init cmx270_init(void)
 		goto err_scan;
 	}
 
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-	mtd_parts_nb = parse_mtd_partitions(cmx270_nand_mtd, part_probes,
+	mtd_parts_nb = parse_mtd_partitions(cmx270_nand_mtd, NULL,
 					    &mtd_parts, 0);
 	if (mtd_parts_nb > 0)
 		part_type = "command line";
 	else
 		mtd_parts_nb = 0;
-#endif
+
 	if (!mtd_parts_nb) {
 		mtd_parts = partition_info;
 		mtd_parts_nb = NUM_PARTITIONS;