diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
| commit | 4905660cd237e4c4ede46920851caa12739f006f (patch) | |
| tree | ef37e7c9f52c9ae9c2b206658556f37d67fe43eb /drivers/mtd/maps/lantiq-flash.c | |
| parent | 1b5e39fc18a1b8ff7ea425ce5f49307cb28a880f (diff) | |
| parent | 0147c2ae9d602b5791dae30322ece475271acd10 (diff) | |
Merge commit 'v3.2.15' into rt-3.2.15-rt24v3.2.15-rt24
Diffstat (limited to 'drivers/mtd/maps/lantiq-flash.c')
| -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 4f10e27ada55..764d4681671c 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"); |