From 4d726e5587ae47f249034851110399678616b919 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Mon, 23 May 2011 10:23:03 +0100
Subject: [PATCH] --- yaml --- r: 252527 b: refs/heads/master c:
 360e40aedb59799fef4ff58fe6b9436cd487f6e6 h: refs/heads/master i:   252525:
 5787be9dbe163c381e610eb74e04742eefccb9db   252523:
 9beb5279bb526d0477b82e67551d6f83e48465f2   252519:
 292f950002933d4ec2a35494149ae1e19aeeef47   252511:
 6bf6e46478f7861d307e8a282d756b0c23d74cc8 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mtd/maps/h720x-flash.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d82f88b11480..6bc17f6798f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdbf3bf6b855233cd618021c702accb69b8b10bc
+refs/heads/master: 360e40aedb59799fef4ff58fe6b9436cd487f6e6
diff --git a/trunk/drivers/mtd/maps/h720x-flash.c b/trunk/drivers/mtd/maps/h720x-flash.c
index 72c724fa8c27..7f035860a36b 100644
--- a/trunk/drivers/mtd/maps/h720x-flash.c
+++ b/trunk/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);
 	}