From 697ca2c1b811c05eb20d78c7f2e71e7c1af4bdaa Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:17:08 +0400 Subject: [PATCH] --- yaml --- r: 274799 b: refs/heads/master c: a4c93614fded8ef0be90fca6a619d3c9c3e9552f h: refs/heads/master i: 274797: 94cb549170f2b2addeacf3fc9f921b8c31155313 274795: 13872504f689972fe07cefc6edeadfcaf98b9c74 274791: 88e84243b8d4058df2b56c9979744eedb06e85d4 274783: 8edb4c983b7823dd3640812c456f9d0f765100dc v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/sharpsl.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 34711fe9301c..e4a7a943a9db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b2efbdf70c74dcab575103c547ae27a71daba4c +refs/heads/master: a4c93614fded8ef0be90fca6a619d3c9c3e9552f diff --git a/trunk/drivers/mtd/nand/sharpsl.c b/trunk/drivers/mtd/nand/sharpsl.c index 19e24ed089ea..b3377f88326e 100644 --- a/trunk/drivers/mtd/nand/sharpsl.c +++ b/trunk/drivers/mtd/nand/sharpsl.c @@ -103,8 +103,6 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat, return readb(sharpsl->io + ECCCNTR) != 0; } -static const char *part_probes[] = { "cmdlinepart", NULL }; - /* * Main initialization routine */ @@ -184,7 +182,7 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev) /* Register the partitions */ sharpsl->mtd.name = "sharpsl-nand"; - nr_partitions = parse_mtd_partitions(&sharpsl->mtd, part_probes, &sharpsl_partition_info, 0); + nr_partitions = parse_mtd_partitions(&sharpsl->mtd, NULL, &sharpsl_partition_info, 0); if (nr_partitions <= 0) { nr_partitions = data->nr_partitions; sharpsl_partition_info = data->partitions;