|
@@ -251,10 +251,6 @@ static int jz_nand_correct_ecc_rs(struct mtd_info *mtd, uint8_t *dat,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_MTD_CMDLINE_PARTS
|
|
|
-static const char *part_probes[] = {"cmdline", NULL};
|
|
|
-#endif
|
|
|
-
|
|
|
static int jz_nand_ioremap_resource(struct platform_device *pdev,
|
|
|
const char *name, struct resource **res, void __iomem **base)
|
|
|
{
|
|
@@ -373,10 +369,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
|
|
|
goto err_gpio_free;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_MTD_CMDLINE_PARTS
|
|
|
- num_partitions = parse_mtd_partitions(mtd, part_probes,
|
|
|
- &partition_info, 0);
|
|
|
-#endif
|
|
|
+ num_partitions = parse_mtd_partitions(mtd, NULL, &partition_info, 0);
|
|
|
if (num_partitions <= 0 && pdata) {
|
|
|
num_partitions = pdata->num_partitions;
|
|
|
partition_info = pdata->partitions;
|