diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 20:17:04 +0400 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 15:02:03 +0300 |
| commit | 4ac6b3ef7191c508a356c205b02ab82f5e228d0c (patch) | |
| tree | a3a9854766deda98a7d15504b8579dfff0408de5 /drivers/mtd/nand/orion_nand.c | |
| parent | f397d8c074c966f61b12c4c554e0aa32704056c7 (diff) | |
| download | op-kernel-dev-4ac6b3ef7191c508a356c205b02ab82f5e228d0c.zip op-kernel-dev-4ac6b3ef7191c508a356c205b02ab82f5e228d0c.tar.gz | |
mtd: orion_nand 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>
Diffstat (limited to 'drivers/mtd/nand/orion_nand.c')
| -rw-r--r-- | drivers/mtd/nand/orion_nand.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 7794d06..5c55981 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c @@ -21,8 +21,6 @@ #include <mach/hardware.h> #include <plat/orion_nand.h> -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; |
