Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[lisovros/linux_canprio.git] / drivers / mtd / nand / pxa3xx_nand.c

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 5d55152162cf5c4e2e09b738535388f55cf4b512..e02fa4f0e3c9a0a81c03bdf80e54d071ed1e079f 100644 (file)
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1320,6 +1320,17 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
                goto fail_free_irq;
        }
 
+       if (mtd_has_cmdlinepart()) {
+               static const char *probes[] = { "cmdlinepart", NULL };
+               struct mtd_partition *parts;
+               int nr_parts;
+
+               nr_parts = parse_mtd_partitions(mtd, probes, &parts, 0);
+
+               if (nr_parts)
+                       return add_mtd_partitions(mtd, parts, nr_parts);
+       }
+
        return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);
 
 fail_free_irq: