Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / arch / mips / cavium-octeon / flash_setup.c

diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c
index 008f657..0ee02f5 100644 (file)
--- a/arch/mips/cavium-octeon/flash_setup.c
+++ b/arch/mips/cavium-octeon/flash_setup.c
@@ -16,7 +16,6 @@
 
 static struct map_info flash_map;
 static struct mtd_info *mymtd;
-#ifdef CONFIG_MTD_PARTITIONS
 static int nr_parts;
 static struct mtd_partition *parts;
 static const char *part_probe_types[] = {
@@ -26,7 +25,6 @@ static const char *part_probe_types[] = {
 #endif
        NULL
 };
-#endif
 
 /**
  * Module/ driver initialization.
@@ -63,17 +61,10 @@ static int __init flash_init(void)
                if (mymtd) {
                        mymtd->owner = THIS_MODULE;
 
-#ifdef CONFIG_MTD_PARTITIONS
                        nr_parts = parse_mtd_partitions(mymtd,
                                                        part_probe_types,
                                                        &parts, 0);
-                       if (nr_parts > 0)
-                               add_mtd_partitions(mymtd, parts, nr_parts);
-                       else
-                               add_mtd_device(mymtd);
-#else
-                       add_mtd_device(mymtd);
-#endif
+                       mtd_device_register(mymtd, parts, nr_parts);
                } else {
                        pr_err("Failed to register MTD device for flash\n");
                }