---

yaml --- r: 303114 b: refs/heads/master c: 5ff2714 h: refs/heads/master v: v3
git-mirror · May 12, 2012 · fae6f54 · fae6f54
1 parent 7057821
commit fae6f54
Show file tree

Hide file tree

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