From c861ffde24d6bb99e84e0c7e56e5178169df1da7 Mon Sep 17 00:00:00 2001
From: Tushar Behera <tushar.behera@linaro.org>
Date: Sat, 12 May 2012 16:12:26 +0900
Subject: [PATCH] --- yaml --- r: 303107 b: refs/heads/master c:
 bc4521d394a55cc2dcca3f208c30d6760c8c7eeb h: refs/heads/master i:   303105:
 6ee27117748abbd35aef55af242cce54b7d3eedc   303103:
 9f474f7c6cfc3ab1a97e9cdc0b28bb05351a865d v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-s3c64xx/mach-mini6410.c | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 2e836e0513dd..197c6a60a90b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ebf148a6807c8a2c5a013b72fc834b739cc85be
+refs/heads/master: bc4521d394a55cc2dcca3f208c30d6760c8c7eeb
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c b/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c
index c34c2ab22ead..b2166d4a5538 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/trunk/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -85,21 +85,10 @@ static struct s3c2410_uartcfg mini6410_uartcfgs[] __initdata = {
 /* DM9000AEP 10/100 ethernet controller */
 
 static struct resource mini6410_dm9k_resource[] = {
-	[0] = {
-		.start	= S3C64XX_PA_XM0CSN1,
-		.end	= S3C64XX_PA_XM0CSN1 + 1,
-		.flags	= IORESOURCE_MEM
-	},
-	[1] = {
-		.start	= S3C64XX_PA_XM0CSN1 + 4,
-		.end	= S3C64XX_PA_XM0CSN1 + 5,
-		.flags	= IORESOURCE_MEM
-	},
-	[2] = {
-		.start	= S3C_EINT(7),
-		.end	= S3C_EINT(7),
-		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL
-	}
+	[0] = DEFINE_RES_MEM(S3C64XX_PA_XM0CSN1, 2),
+	[1] = DEFINE_RES_MEM(S3C64XX_PA_XM0CSN1 + 4, 2),
+	[2] = DEFINE_RES_NAMED(S3C_EINT(7), 1, NULL, IORESOURCE_IRQ \
+					| IORESOURCE_IRQ_HIGHLEVEL),
 };
 
 static struct dm9000_plat_data mini6410_dm9k_pdata = {