diff options
Diffstat (limited to 'drivers/mtd/nand/bf5xx_nand.c')
-rw-r--r-- | drivers/mtd/nand/bf5xx_nand.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c index 79947bea4d57..dd899cb5d366 100644 --- a/drivers/mtd/nand/bf5xx_nand.c +++ b/drivers/mtd/nand/bf5xx_nand.c | |||
@@ -659,15 +659,10 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info) | |||
659 | static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) | 659 | static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) |
660 | { | 660 | { |
661 | struct mtd_info *mtd = &info->mtd; | 661 | struct mtd_info *mtd = &info->mtd; |
662 | |||
663 | #ifdef CONFIG_MTD_PARTITIONS | ||
664 | struct mtd_partition *parts = info->platform->partitions; | 662 | struct mtd_partition *parts = info->platform->partitions; |
665 | int nr = info->platform->nr_partitions; | 663 | int nr = info->platform->nr_partitions; |
666 | 664 | ||
667 | return add_mtd_partitions(mtd, parts, nr); | 665 | return mtd_device_register(mtd, parts, nr); |
668 | #else | ||
669 | return add_mtd_device(mtd); | ||
670 | #endif | ||
671 | } | 666 | } |
672 | 667 | ||
673 | static int __devexit bf5xx_nand_remove(struct platform_device *pdev) | 668 | static int __devexit bf5xx_nand_remove(struct platform_device *pdev) |