From a1628850e7cfa6c8617a3d58aa29198169f91d28 Mon Sep 17 00:00:00 2001
From: Sekhar Nori <nsekhar@ti.com>
Date: Fri, 9 Oct 2009 20:55:42 +0530
Subject: [PATCH] --- yaml --- r: 173348 b: refs/heads/master c:
 5950b55b0498f268d1ffa6adb63f96a1f350c37e h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-davinci/board-da830-evm.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 3dbb2cb6e43c..7bdc8bb13dc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 733975a314e4ddd374676cd300e207dd44eeafd2
+refs/heads/master: 5950b55b0498f268d1ffa6adb63f96a1f350c37e
diff --git a/trunk/arch/arm/mach-davinci/board-da830-evm.c b/trunk/arch/arm/mach-davinci/board-da830-evm.c
index ea9bc25e9288..dc169ec80a9f 100644
--- a/trunk/arch/arm/mach-davinci/board-da830-evm.c
+++ b/trunk/arch/arm/mach-davinci/board-da830-evm.c
@@ -412,12 +412,6 @@ static struct platform_device da830_evm_nand_device = {
 };
 #endif
 
-static struct platform_device *da830_evm_devices[] __initdata = {
-#ifdef CONFIG_DA830_UI_NAND
-	&da830_evm_nand_device,
-#endif
-};
-
 /*
  * UI board NAND/NOR flashes only use 8-bit data bus.
  */
@@ -502,10 +496,9 @@ static __init void da830_evm_init(void)
 		pr_warning("da830_evm_init: emif25 mux setup failed: %d\n",
 				ret);
 
-	ret = platform_add_devices(da830_evm_devices,
-			ARRAY_SIZE(da830_evm_devices));
+	ret = platform_device_register(&da830_evm_nand_device);
 	if (ret)
-		pr_warning("da830_evm_init: EVM devices not added\n");
+		pr_warning("da830_evm_init: NAND device not registered.\n");
 #endif
 #endif