From 13872504f689972fe07cefc6edeadfcaf98b9c74 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:17:04 +0400 Subject: [PATCH] --- yaml --- r: 274795 b: refs/heads/master c: 4ac6b3ef7191c508a356c205b02ab82f5e228d0c h: refs/heads/master i: 274793: f0cc422638dfb419cd5d6bddef0f6f02f07b3a97 274791: 88e84243b8d4058df2b56c9979744eedb06e85d4 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/orion_nand.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7f3ebb57cf7e..c2f55d6804b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f397d8c074c966f61b12c4c554e0aa32704056c7 +refs/heads/master: 4ac6b3ef7191c508a356c205b02ab82f5e228d0c diff --git a/trunk/drivers/mtd/nand/orion_nand.c b/trunk/drivers/mtd/nand/orion_nand.c index 7794d0680f91..5c55981df3da 100644 --- a/trunk/drivers/mtd/nand/orion_nand.c +++ b/trunk/drivers/mtd/nand/orion_nand.c @@ -21,8 +21,6 @@ #include #include -static const char *part_probes[] = { "cmdlinepart", NULL }; - static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) { struct nand_chip *nc = mtd->priv; @@ -132,10 +130,8 @@ static int __init orion_nand_probe(struct platform_device *pdev) goto no_dev; } -#ifdef CONFIG_MTD_CMDLINE_PARTS mtd->name = "orion_nand"; - num_part = parse_mtd_partitions(mtd, part_probes, &partitions, 0); -#endif + num_part = parse_mtd_partitions(mtd, NULL, &partitions, 0); /* If cmdline partitions have been passed, let them be used */ if (num_part <= 0) { num_part = board->nr_parts;