summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:16:55 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:01 +0300
commit495e2f41c38c99b2785cd3d99b24b080b20e8eb4 (patch)
tree3a5d03606f3a22ba21ad4a2682e5e9dd5294266e
parent4e243a04c39b009e42ff4a4682ed47b850997dc1 (diff)
downloadlinux-stable-495e2f41c38c99b2785cd3d99b24b080b20e8eb4.tar.gz
linux-stable-495e2f41c38c99b2785cd3d99b24b080b20e8eb4.tar.bz2
linux-stable-495e2f41c38c99b2785cd3d99b24b080b20e8eb4.zip
mtd: edb7312 don't specify default parsing options
Since 'cmdline, NULL' is now a default for parse_mtd_partitions, don't specify this in every driver, instead pass NULL to force parse_mtd_partitions to use default. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/nand/edb7312.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c
index 8400d0f6dada..2f9374b38b90 100644
--- a/drivers/mtd/nand/edb7312.c
+++ b/drivers/mtd/nand/edb7312.c
@@ -98,8 +98,6 @@ static int ep7312_device_ready(struct mtd_info *mtd)
return 1;
}
-const char *part_probes[] = { "cmdlinepart", NULL };
-
/*
* Main initialization routine
*/
@@ -158,7 +156,7 @@ static int __init ep7312_init(void)
return -ENXIO;
}
ep7312_mtd->name = "edb7312-nand";
- mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, part_probes, &mtd_parts, 0);
+ mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else