From 914a9772fefccff4f2a60efcc57589fcb03bb5cb Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Mon, 23 May 2011 10:23:12 +0100
Subject: [PATCH] --- yaml --- r: 252536 b: refs/heads/master c:
 5e7e96866df7a9ff7733bd1660e0a3c510bf1b45 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mtd/maps/Kconfig   |  2 +-
 trunk/drivers/mtd/maps/uclinux.c | 12 ++----------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5536584f770a..bf84386b759c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5c0a4ea1ba0b6840bc8522c6ce901a7658b395a
+refs/heads/master: 5e7e96866df7a9ff7733bd1660e0a3c510bf1b45
diff --git a/trunk/drivers/mtd/maps/Kconfig b/trunk/drivers/mtd/maps/Kconfig
index add25a94ce4a..44032433730d 100644
--- a/trunk/drivers/mtd/maps/Kconfig
+++ b/trunk/drivers/mtd/maps/Kconfig
@@ -472,7 +472,7 @@ config MTD_GPIO_ADDR
 
 config MTD_UCLINUX
 	bool "Generic uClinux RAM/ROM filesystem support"
-	depends on MTD_PARTITIONS && MTD_RAM=y && !MMU
+	depends on MTD_RAM=y && !MMU
 	help
 	  Map driver to support image based filesystems for uClinux.
 
diff --git a/trunk/drivers/mtd/maps/uclinux.c b/trunk/drivers/mtd/maps/uclinux.c
index 35009294b435..6793074f3f40 100644
--- a/trunk/drivers/mtd/maps/uclinux.c
+++ b/trunk/drivers/mtd/maps/uclinux.c
@@ -89,11 +89,7 @@ static int __init uclinux_mtd_init(void)
 	mtd->priv = mapp;
 
 	uclinux_ram_mtdinfo = mtd;
-#ifdef CONFIG_MTD_PARTITIONS
-	add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
-#else
-	add_mtd_device(mtd);
-#endif
+	mtd_device_register(mtd, uclinux_romfs, NUM_PARTITIONS);
 
 	return(0);
 }
@@ -103,11 +99,7 @@ static int __init uclinux_mtd_init(void)
 static void __exit uclinux_mtd_cleanup(void)
 {
 	if (uclinux_ram_mtdinfo) {
-#ifdef CONFIG_MTD_PARTITIONS
-		del_mtd_partitions(uclinux_ram_mtdinfo);
-#else
-		del_mtd_device(uclinux_ram_mtdinfo);
-#endif
+		mtd_device_unregister(uclinux_ram_mtdinfo);
 		map_destroy(uclinux_ram_mtdinfo);
 		uclinux_ram_mtdinfo = NULL;
 	}