summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-09-29 00:16:44 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:04 -0800
commit591921cf279d41e9861f732d0fa1309d66a63ef4 (patch)
treeecf09ed25e2e3b847c3077d7ad79dbb63fc82c9b /drivers
parentb75c817579caad60485db76547182b6fd336c58c (diff)
3.0: update mtd api
Rebase-Id: R3cff5fe5cf5f95670f9481dcbf66d230e3cde6b1
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/devices/tegra_nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/tegra_nand.c b/drivers/mtd/devices/tegra_nand.c
index d614ab8d8467..9549a0322c92 100644
--- a/drivers/mtd/devices/tegra_nand.c
+++ b/drivers/mtd/devices/tegra_nand.c
@@ -1648,12 +1648,12 @@ static int __devinit tegra_nand_probe(struct platform_device *pdev)
#ifdef CONFIG_MTD_PARTITIONS
err = parse_mtd_partitions(mtd, part_probes, &info->parts, 0);
if (err > 0) {
- err = add_mtd_partitions(mtd, info->parts, err);
+ err = mtd_device_register(mtd, info->parts, err);
} else if (err <= 0 && plat->parts) {
- err = add_mtd_partitions(mtd, plat->parts, plat->nr_parts);
+ err = mtd_device_register(mtd, plat->parts, plat->nr_parts);
} else
#endif
- err = add_mtd_device(mtd);
+ err = mtd_device_register(mtd, NULL, 0);
if (err != 0)
goto out_free_bbbmap;