diff options
author | Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> | 2012-02-23 11:59:49 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-03-26 19:38:51 -0400 |
commit | bf011f2ed53d587fdd8148c173c4f09ed77bdf1a (patch) | |
tree | 7eb3885878b71afa1d5453d8c9eb9b8e483c20b4 /drivers/mtd/maps | |
parent | d42b5de35fb058513367d1a9ee146be5aaab7c6a (diff) |
mtd: mips: lantiq: reintroduce support for cmdline partitions
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>
Cc: stable@kernel.org [3.2+]
Acked-by: John Crispin <blogic@openwrt.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/maps')
-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 7b889de9477b..cf7a3cddad35 100644 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c | |||
@@ -45,6 +45,7 @@ struct ltq_mtd { | |||
45 | }; | 45 | }; |
46 | 46 | ||
47 | static char ltq_map_name[] = "ltq_nor"; | 47 | static char ltq_map_name[] = "ltq_nor"; |
48 | static const char *ltq_probe_types[] __devinitconst = { "cmdlinepart", NULL }; | ||
48 | 49 | ||
49 | static map_word | 50 | static map_word |
50 | ltq_read16(struct map_info *map, unsigned long adr) | 51 | ltq_read16(struct map_info *map, unsigned long adr) |
@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pdev) | |||
168 | cfi->addr_unlock1 ^= 1; | 169 | cfi->addr_unlock1 ^= 1; |
169 | cfi->addr_unlock2 ^= 1; | 170 | cfi->addr_unlock2 ^= 1; |
170 | 171 | ||
171 | err = mtd_device_parse_register(ltq_mtd->mtd, NULL, 0, | 172 | err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types, 0, |
172 | ltq_mtd_data->parts, ltq_mtd_data->nr_parts); | 173 | ltq_mtd_data->parts, ltq_mtd_data->nr_parts); |
173 | if (err) { | 174 | if (err) { |
174 | dev_err(&pdev->dev, "failed to add partitions\n"); | 175 | dev_err(&pdev->dev, "failed to add partitions\n"); |