---

yaml --- r: 173348 b: refs/heads/master c: 5950b55 h: refs/heads/master v: v3
git-mirror · Nov 25, 2009 · a162885 · a162885
1 parent 4c36980
commit a162885
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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