From 2d5921663a5e7e86f267df846805dd3b4294917b Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Mon, 23 May 2011 10:23:29 +0100
Subject: [PATCH] --- yaml --- r: 252553 b: refs/heads/master c:
 a04d23dfea631993bcb256c638e379c002af9e4f h: refs/heads/master i:   252551:
 746781f3be7776222685a422f92eba117d7498f7 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/mtd/nand/nomadik_nand.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5f4c4d47101c..6c79670bb3fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f3a7c626f7e55657255df89fab418714502093a
+refs/heads/master: a04d23dfea631993bcb256c638e379c002af9e4f
diff --git a/trunk/drivers/mtd/nand/nomadik_nand.c b/trunk/drivers/mtd/nand/nomadik_nand.c
index a045a4a581b6..b6a5c86ab31e 100644
--- a/trunk/drivers/mtd/nand/nomadik_nand.c
+++ b/trunk/drivers/mtd/nand/nomadik_nand.c
@@ -158,12 +158,7 @@ static int nomadik_nand_probe(struct platform_device *pdev)
 		goto err_unmap;
 	}
 
-#ifdef CONFIG_MTD_PARTITIONS
-	add_mtd_partitions(&host->mtd, pdata->parts, pdata->nparts);
-#else
-	pr_info("Registering %s as whole device\n", mtd->name);
-	add_mtd_device(mtd);
-#endif
+	mtd_device_register(&host->mtd, pdata->parts, pdata->nparts);
 
 	platform_set_drvdata(pdev, host);
 	return 0;