From 8edb4c983b7823dd3640812c456f9d0f765100dc Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:16:53 +0400 Subject: [PATCH] --- yaml --- r: 274783 b: refs/heads/master c: 5987d3f45a3819985eb8f34203a5ca2604f08c06 h: refs/heads/master i: 274781: c2d2f7e80eb12066c6040c53e90a67bd1594865f 274779: 669008c43bae92130bf814d81fcca1f4526ece26 274775: a2ae7c66fefac5dedb47e0a9b67c2e42d3d493d3 274767: e590b503a26fa481d61cb20d2bf32c458114fb77 274751: be1ed37cfa6a2479cb59c48746ab1cbd1db4a363 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/cs553x_nand.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 82b0d335387f..533f53514a7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00205e831326f7fc22888de152b313c89a43a110 +refs/heads/master: 5987d3f45a3819985eb8f34203a5ca2604f08c06 diff --git a/trunk/drivers/mtd/nand/cs553x_nand.c b/trunk/drivers/mtd/nand/cs553x_nand.c index b35496143e74..b2bdf72a9f19 100644 --- a/trunk/drivers/mtd/nand/cs553x_nand.c +++ b/trunk/drivers/mtd/nand/cs553x_nand.c @@ -278,8 +278,6 @@ static int is_geode(void) return 0; } -static const char *part_probes[] = { "cmdlinepart", NULL }; - static int __init cs553x_init(void) { int err = -ENXIO; @@ -318,9 +316,7 @@ static int __init cs553x_init(void) if (cs553x_mtd[i]) { /* If any devices registered, return success. Else the last error. */ - mtd_parts_nb = parse_mtd_partitions(cs553x_mtd[i], part_probes, &mtd_parts, 0); - if (mtd_parts_nb > 0) - printk(KERN_NOTICE "Using command line partition definition\n"); + mtd_parts_nb = parse_mtd_partitions(cs553x_mtd[i], NULL, &mtd_parts, 0); mtd_device_register(cs553x_mtd[i], mtd_parts, mtd_parts_nb); err = 0;