Merge branch 'setns'

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

diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 9639d83a9d6c9303b123ba39a399f3c9594154c5..c00b9175ba9e7c3a747a0ecba02c17486419d106 100644 (file)
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -119,7 +119,7 @@ static int ixp2000_flash_remove(struct platform_device *dev)
                return 0;
 
        if (info->mtd) {
-               del_mtd_partitions(info->mtd);
+               mtd_device_unregister(info->mtd);
                map_destroy(info->mtd);
        }
        if (info->map.map_priv_1)
@@ -230,7 +230,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
 
        err = parse_mtd_partitions(info->mtd, probes, &info->partitions, 0);
        if (err > 0) {
-               err = add_mtd_partitions(info->mtd, info->partitions, err);
+               err = mtd_device_register(info->mtd, info->partitions, err);
                if(err)
                        dev_err(&dev->dev, "Could not parse partitions\n");
        }