From b13f7485c91db87b08d08d6ee9f19aa04a950cb0 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 30 Oct 2006 14:47:21 +0000
Subject: [PATCH] --- yaml --- r: 40494 b: refs/heads/master c:
 4aad7b726996a2d453d210cd5691730aca087b83 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/mips/emma2rh/markeins/platform.c | 39 +++++++++++++++++----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 795ae3276bb3..77619ad4ecc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e30e66becaa237d1753d148703cf8f1301ab27f0
+refs/heads/master: 4aad7b726996a2d453d210cd5691730aca087b83
diff --git a/trunk/arch/mips/emma2rh/markeins/platform.c b/trunk/arch/mips/emma2rh/markeins/platform.c
index 0b884a12170d..be13cecfc06f 100644
--- a/trunk/arch/mips/emma2rh/markeins/platform.c
+++ b/trunk/arch/mips/emma2rh/markeins/platform.c
@@ -44,18 +44,45 @@
 #define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */
 
 static struct resource i2c_emma_resources_0[] = {
-	{ NULL, EMMA2RH_IRQ_PIIC0, EMMA2RH_IRQ_PIIC0, IORESOURCE_IRQ },
-	{ NULL, KSEG1ADDR(EMMA2RH_PIIC0_BASE), KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000), 0 },
+	{
+		.name	= NULL,
+		.start	= EMMA2RH_IRQ_PIIC0,
+		.end	= EMMA2RH_IRQ_PIIC0,
+		.flags	= IORESOURCE_IRQ
+	}, {
+		.name	= NULL,
+		.start	= KSEG1ADDR(EMMA2RH_PIIC0_BASE),
+		.end	= KSEG1ADDR(EMMA2RH_PIIC0_BASE + 0x1000),
+		.flags	= 0
+	},
 };
 
 struct resource i2c_emma_resources_1[] = {
-	{ NULL, EMMA2RH_IRQ_PIIC1, EMMA2RH_IRQ_PIIC1, IORESOURCE_IRQ },
-	{ NULL, KSEG1ADDR(EMMA2RH_PIIC1_BASE), KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000), 0 },
+	{
+		.name	= NULL,
+		.start	= EMMA2RH_IRQ_PIIC1,
+		.end	= EMMA2RH_IRQ_PIIC1,
+		.flags	= IORESOURCE_IRQ
+	}, {
+		.name	= NULL,
+		.start	= KSEG1ADDR(EMMA2RH_PIIC1_BASE),
+		.end	= KSEG1ADDR(EMMA2RH_PIIC1_BASE + 0x1000),
+		.flags	= 0
+	},
 };
 
 struct resource i2c_emma_resources_2[] = {
-	{ NULL, EMMA2RH_IRQ_PIIC2, EMMA2RH_IRQ_PIIC2, IORESOURCE_IRQ },
-	{ NULL, KSEG1ADDR(EMMA2RH_PIIC2_BASE), KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000), 0 },
+	{
+		.name	= NULL,
+		.start	= EMMA2RH_IRQ_PIIC2,
+		.end	= EMMA2RH_IRQ_PIIC2,
+		.flags	= IORESOURCE_IRQ
+	}, {
+		.name	= NULL,
+		.start	= KSEG1ADDR(EMMA2RH_PIIC2_BASE),
+		.end	= KSEG1ADDR(EMMA2RH_PIIC2_BASE + 0x1000),
+		.flags	= 0
+	},
 };
 
 struct platform_device i2c_emma_devices[] = {