diff options
| author | Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> | 2012-02-23 17:59:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 08:33:46 -0700 |
| commit | 7cc1b0b2fea66ee8d4ee4a1aacafb543168db914 (patch) | |
| tree | ba8f95324282d24728cff0afe3bd8092349e76ef /drivers/mtd | |
| parent | 16dcb2d3d104ca9cdd9547969deab9903226948a (diff) | |
| download | kernel_samsung_smdk4412-7cc1b0b2fea66ee8d4ee4a1aacafb543168db914.zip kernel_samsung_smdk4412-7cc1b0b2fea66ee8d4ee4a1aacafb543168db914.tar.gz kernel_samsung_smdk4412-7cc1b0b2fea66ee8d4ee4a1aacafb543168db914.tar.bz2 | |
mtd: mips: lantiq: reintroduce support for cmdline partitions
commit bf011f2ed53d587fdd8148c173c4f09ed77bdf1a upstream.
Since commit ca97dec2ab5c87e9fbdf7e882e1820004a3966fa the
command line parsing of MTD partitions does not work anymore.
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: John Crispin <blogic@openwrt.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/lantiq-flash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c index 4f10e27..764d468 100644 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c @@ -45,6 +45,7 @@ struct ltq_mtd { }; static char ltq_map_name[] = "ltq_nor"; +static const char *ltq_probe_types[] __devinitconst = { "cmdlinepart", NULL }; static map_word ltq_read16(struct map_info *map, unsigned long adr) @@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pdev) cfi->addr_unlock1 ^= 1; cfi->addr_unlock2 ^= 1; - err = mtd_device_parse_register(ltq_mtd->mtd, NULL, 0, + err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types, 0, ltq_mtd_data->parts, ltq_mtd_data->nr_parts); if (err) { dev_err(&pdev->dev, "failed to add partitions\n"); |