dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[MTD] NAND Fixup NDFC merge brokeness

Browse source 
Remove the remains of a broken merge.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2006-06-16 18:10:09 +02:00 committed by David Woodhouse
parent ad3b5fb772
commit b6d5ee00e3
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/mtd/nand/ndfc.c
View file

@ -203,16 +203,11 @@ static int ndfc_chip_probe(struct platform_device *pdev)
#ifdef CONFIG_MTD_PARTITIONS
printk("Number of partitions %d\n", nc->nr_partitions);
if (nc->nr_partitions) {
struct mtd_info *mtd_ubi;
nc->partitions[NAND_PARTS_CONTENT_IDX].mtdp = &mtd_ubi;
add_mtd_device(&nandmtd->mtd); /* for testing */
add_mtd_partitions(&nandmtd->mtd,
nc->partitions,
/* Add the full device, so complete dumps can be made */
add_mtd_device(&nandmtd->mtd);
add_mtd_partitions(&nandmtd->mtd, nc->partitions,
nc->nr_partitions);
add_mtd_device(mtd_ubi);
} else
#else
add_mtd_device(&nandmtd->mtd);
@ -233,7 +228,7 @@ static int ndfc_nand_probe(struct platform_device *pdev)
struct ndfc_controller_settings *settings = nc->priv;
struct resource *res = pdev->resource;
struct ndfc_controller *ndfc = &ndfc_ctrl;
unsigned long long phys = setting->erpn | res->start;
unsigned long long phys = settings->ndfc_erpn | res->start;
ndfc->ndfcbase = ioremap64(phys, res->end - res->start + 1);
if (!ndfc->ndfcbase) {