From d033320e51e98892c00354d39663596facc0924a Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:25:00 +0400 Subject: [PATCH] --- yaml --- r: 274790 b: refs/heads/master c: 0455dfd4c8614ae971202697f6db4d239e0b44c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/lantiq-flash.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4411673c20d7..d0e5e14bd001 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bef06150b2c0607edbee8e8c5fd7e882a90a976a +refs/heads/master: 0455dfd4c8614ae971202697f6db4d239e0b44c3 diff --git a/trunk/drivers/mtd/maps/lantiq-flash.c b/trunk/drivers/mtd/maps/lantiq-flash.c index a90cabd7b84d..57ea3fe2296f 100644 --- a/trunk/drivers/mtd/maps/lantiq-flash.c +++ b/trunk/drivers/mtd/maps/lantiq-flash.c @@ -107,8 +107,6 @@ ltq_copy_to(struct map_info *map, unsigned long to, spin_unlock_irqrestore(&ebu_lock, flags); } -static const char const *part_probe_types[] = { "cmdlinepart", NULL }; - static int __init ltq_mtd_probe(struct platform_device *pdev) { @@ -172,8 +170,7 @@ ltq_mtd_probe(struct platform_device *pdev) cfi->addr_unlock1 ^= 1; cfi->addr_unlock2 ^= 1; - nr_parts = parse_mtd_partitions(ltq_mtd->mtd, - part_probe_types, &parts, 0); + nr_parts = parse_mtd_partitions(ltq_mtd->mtd, NULL, &parts, 0); if (nr_parts > 0) { dev_info(&pdev->dev, "using %d partitions from cmdline", nr_parts);