From f9bf7d6f63cd1325b4262983d556d0dd75ac02a5 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <Aaro.Koskinen@nokia.com>
Date: Thu, 2 Dec 2010 15:51:24 +0000
Subject: [PATCH] --- yaml --- r: 226467 b: refs/heads/master c:
 5403187f83c12c6f4c03547e0cc05bac0310be7b h: refs/heads/master i:   226465:
 936dd6fae29f0c558a5371498810a27a00924881   226463:
 5a12dd01410201388d35d268736c2471291ff3d1 v: v3

---
 [refs]                                        |  2 +-
 .../arm/mach-omap2/board-rx51-peripherals.c   | 28 ++++++-------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index c9a411301350..188bc2593374 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1a92e6fccadbba1846a081f21d0c12a10addd56
+refs/heads/master: 5403187f83c12c6f4c03547e0cc05bac0310be7b
diff --git a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
index 3fda20d73233..126b724a5e2d 100644
--- a/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -817,25 +817,15 @@ static struct mtd_partition onenand_partitions[] = {
 	},
 };
 
-static struct omap_onenand_platform_data board_onenand_data = {
-	.cs		= 0,
-	.gpio_irq	= 65,
-	.parts		= onenand_partitions,
-	.nr_parts	= ARRAY_SIZE(onenand_partitions),
-	.flags		= ONENAND_SYNC_READWRITE,
+static struct omap_onenand_platform_data board_onenand_data[] = {
+	{
+		.cs		= 0,
+		.gpio_irq	= 65,
+		.parts		= onenand_partitions,
+		.nr_parts	= ARRAY_SIZE(onenand_partitions),
+		.flags		= ONENAND_SYNC_READWRITE,
+	}
 };
-
-static void __init board_onenand_init(void)
-{
-	gpmc_onenand_init(&board_onenand_data);
-}
-
-#else
-
-static inline void board_onenand_init(void)
-{
-}
-
 #endif
 
 #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
@@ -918,7 +908,7 @@ static void __init rx51_init_wl1251(void)
 void __init rx51_peripherals_init(void)
 {
 	rx51_i2c_init();
-	board_onenand_init();
+	gpmc_onenand_init(board_onenand_data);
 	board_smc91x_init();
 	rx51_add_gpio_keys();
 	rx51_init_wl1251();