From 6262922103d683dd09463c0a62e222295ce53b1a Mon Sep 17 00:00:00 2001 From: Jamie Iles Date: Mon, 23 May 2011 10:23:15 +0100 Subject: [PATCH] --- yaml --- r: 252539 b: refs/heads/master c: 88146872f0fbd89e425e3e0db71d42df8db9d932 h: refs/heads/master i: 252537: 68c97585bad0bb36c0e246175bdef7b5bd07f7cf 252535: 255ec21893bd1e48fbd8265b01bd896f209272e3 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/bf5xx_nand.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bb5b5ac91d3e..80db5c57d7cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63c9dd92579fbaa59fead0e9b75dd7db43130d21 +refs/heads/master: 88146872f0fbd89e425e3e0db71d42df8db9d932 diff --git a/trunk/drivers/mtd/nand/bf5xx_nand.c b/trunk/drivers/mtd/nand/bf5xx_nand.c index 79947bea4d57..dd899cb5d366 100644 --- a/trunk/drivers/mtd/nand/bf5xx_nand.c +++ b/trunk/drivers/mtd/nand/bf5xx_nand.c @@ -659,15 +659,10 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info) static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) { struct mtd_info *mtd = &info->mtd; - -#ifdef CONFIG_MTD_PARTITIONS struct mtd_partition *parts = info->platform->partitions; int nr = info->platform->nr_partitions; - return add_mtd_partitions(mtd, parts, nr); -#else - return add_mtd_device(mtd); -#endif + return mtd_device_register(mtd, parts, nr); } static int __devexit bf5xx_nand_remove(struct platform_device *pdev)