1 files changed, 2 insertions, 14 deletions

diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index cea775aa9482..4405468f196b 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -744,7 +744,6 @@ static int s3c24xx_nand_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                                       struct s3c2410_nand_mtd *mtd,
@@ -754,7 +753,7 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
         int nr_part = 0;
 
         if (set == NULL)
-                return add_mtd_device(&mtd->mtd);
+                return mtd_device_register(&mtd->mtd, NULL, 0);
 
         mtd->mtd.name = set->name;
         nr_part = parse_mtd_partitions(&mtd->mtd, part_probes, &part_info, 0);
@@ -764,19 +763,8 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                 part_info = set->partitions;
         }
 
-        if (nr_part > 0 && part_info)
-                return add_mtd_partitions(&mtd->mtd, part_info, nr_part);
-
-        return add_mtd_device(&mtd->mtd);
-}
-#else
-static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
-                                      struct s3c2410_nand_mtd *mtd,
-                                      struct s3c2410_nand_set *set)
-{
-        return add_mtd_device(&mtd->mtd);
+        return mtd_device_register(&mtd->mtd, part_info, nr_part);
 }
-#endif
 
 /**
  * s3c2410_nand_init_chip - initialise a single instance of an chip