Merge branch 'setns'

[karo-tx-linux.git] / drivers / mtd / maps / h720x-flash.c

diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c
index 72c724fa8c276a3c6e6698e7d31eb4f60f9cc3bb..7f035860a36bd43b8683945804fee50690f32351 100644 (file)
--- a/drivers/mtd/maps/h720x-flash.c
+++ b/drivers/mtd/maps/h720x-flash.c
@@ -92,18 +92,16 @@ static int __init h720x_mtd_init(void)
        if (mymtd) {
                mymtd->owner = THIS_MODULE;
 
-#ifdef CONFIG_MTD_PARTITIONS
                nr_mtd_parts = parse_mtd_partitions(mymtd, probes, &mtd_parts, 0);
                if (nr_mtd_parts > 0)
                        part_type = "command line";
-#endif
                if (nr_mtd_parts <= 0) {
                        mtd_parts = h720x_partitions;
                        nr_mtd_parts = NUM_PARTITIONS;
                        part_type = "builtin";
                }
                printk(KERN_INFO "Using %s partition table\n", part_type);
-               add_mtd_partitions(mymtd, mtd_parts, nr_mtd_parts);
+               mtd_device_register(mymtd, mtd_parts, nr_mtd_parts);
                return 0;
        }
 
@@ -118,7 +116,7 @@ static void __exit h720x_mtd_cleanup(void)
 {
 
        if (mymtd) {
-               del_mtd_partitions(mymtd);
+               mtd_device_unregister(mymtd);
                map_destroy(mymtd);
        }