From de14b808e5186ba3b48cf47a98363fdbfebbf717 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:16:55 +0400 Subject: [PATCH] --- yaml --- r: 274785 b: refs/heads/master c: 495e2f41c38c99b2785cd3d99b24b080b20e8eb4 h: refs/heads/master i: 274783: 8edb4c983b7823dd3640812c456f9d0f765100dc v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/edb7312.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 32b19ff2cef2..afdaea089bf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e243a04c39b009e42ff4a4682ed47b850997dc1 +refs/heads/master: 495e2f41c38c99b2785cd3d99b24b080b20e8eb4 diff --git a/trunk/drivers/mtd/nand/edb7312.c b/trunk/drivers/mtd/nand/edb7312.c index 8400d0f6dada..2f9374b38b90 100644 --- a/trunk/drivers/mtd/nand/edb7312.c +++ b/trunk/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