From fae6f54acf63b9f30cfd5521d353dc170b38252a Mon Sep 17 00:00:00 2001
From: Tushar Behera <tushar.behera@linaro.org>
Date: Sun, 13 May 2012 06:47:07 +0900
Subject: [PATCH] --- yaml --- r: 303114 b: refs/heads/master c:
 5ff2714ae05b103d710fa7edbc6fb5d6f0f71beb h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/arm/mach-s3c24xx/mach-osiris.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index eda78ed04dd9..dd77ea503e2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6e059417daefb501174ec4157828037d5d58358
+refs/heads/master: 5ff2714ae05b103d710fa7edbc6fb5d6f0f71beb
diff --git a/trunk/arch/arm/mach-s3c24xx/mach-osiris.c b/trunk/arch/arm/mach-s3c24xx/mach-osiris.c
index c5daeb612a88..95d077255024 100644
--- a/trunk/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/trunk/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -244,16 +244,8 @@ static struct s3c2410_platform_nand __initdata osiris_nand_info = {
 /* PCMCIA control and configuration */
 
 static struct resource osiris_pcmcia_resource[] = {
-	[0] = {
-		.start	= 0x0f000000,
-		.end	= 0x0f100000,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= 0x0c000000,
-		.end	= 0x0c100000,
-		.flags	= IORESOURCE_MEM,
-	}
+	[0] = DEFINE_RES_MEM(0x0f000000, SZ_1M),
+	[1] = DEFINE_RES_MEM(0x0c000000, SZ_1M),
 };
 
 static struct platform_device osiris_pcmcia = {