aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@cruncher.tec.linutronix.de>2006-06-16 12:10:09 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-06-20 15:31:23 -0400
commitb6d5ee00e397b20dc88f7ffaa6f7651b71996a5c (patch)
tree3b6f5c72fe60de068051189fd1d74962c2a147e7 /drivers/mtd
parentad3b5fb772e6a824f1ac341eb8e392eca6fc524f (diff)
[MTD] NAND Fixup NDFC merge brokeness
Remove the remains of a broken merge. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/ndfc.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 551702ddcacb..fe8d38514ba6 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -203,16 +203,11 @@ static int ndfc_chip_probe(struct platform_device *pdev)
203#ifdef CONFIG_MTD_PARTITIONS 203#ifdef CONFIG_MTD_PARTITIONS
204 printk("Number of partitions %d\n", nc->nr_partitions); 204 printk("Number of partitions %d\n", nc->nr_partitions);
205 if (nc->nr_partitions) { 205 if (nc->nr_partitions) {
206 struct mtd_info *mtd_ubi; 206 /* Add the full device, so complete dumps can be made */
207 nc->partitions[NAND_PARTS_CONTENT_IDX].mtdp = &mtd_ubi; 207 add_mtd_device(&nandmtd->mtd);
208 208 add_mtd_partitions(&nandmtd->mtd, nc->partitions,
209 add_mtd_device(&nandmtd->mtd); /* for testing */
210 add_mtd_partitions(&nandmtd->mtd,
211 nc->partitions,
212 nc->nr_partitions); 209 nc->nr_partitions);
213 210
214 add_mtd_device(mtd_ubi);
215
216 } else 211 } else
217#else 212#else
218 add_mtd_device(&nandmtd->mtd); 213 add_mtd_device(&nandmtd->mtd);
@@ -233,7 +228,7 @@ static int ndfc_nand_probe(struct platform_device *pdev)
233 struct ndfc_controller_settings *settings = nc->priv; 228 struct ndfc_controller_settings *settings = nc->priv;
234 struct resource *res = pdev->resource; 229 struct resource *res = pdev->resource;
235 struct ndfc_controller *ndfc = &ndfc_ctrl; 230 struct ndfc_controller *ndfc = &ndfc_ctrl;
236 unsigned long long phys = setting->erpn | res->start; 231 unsigned long long phys = settings->ndfc_erpn | res->start;
237 232
238 ndfc->ndfcbase = ioremap64(phys, res->end - res->start + 1); 233 ndfc->ndfcbase = ioremap64(phys, res->end - res->start + 1);
239 if (!ndfc->ndfcbase) { 234 if (!ndfc->ndfcbase) {