diff --git a/[refs] b/[refs] index 759e20fc7f9d..4e990c33f176 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 940e46ae23ccf908925a4229b34ba1feb8758545 +refs/heads/master: 3d52cad455c9d28ccd2628a5f910a76ff1ac85b4 diff --git a/trunk/arch/arm/mach-s3c24xx/simtec-nor.c b/trunk/arch/arm/mach-s3c24xx/simtec-nor.c index b9d6d4f92c03..029744fcaacb 100644 --- a/trunk/arch/arm/mach-s3c24xx/simtec-nor.c +++ b/trunk/arch/arm/mach-s3c24xx/simtec-nor.c @@ -55,11 +55,7 @@ static struct physmap_flash_data simtec_nor_pdata = { }; static struct resource simtec_nor_resource[] = { - [0] = { - .start = S3C2410_CS1 + 0x4000000, - .end = S3C2410_CS1 + 0x4000000 + SZ_8M - 1, - .flags = IORESOURCE_MEM, - } + [0] = DEFINE_RES_MEM(S3C2410_CS1 + 0x4000000, SZ_8M), }; static struct platform_device simtec_device_nor = {