diff --git a/[refs] b/[refs] index cd3dc417f2fc..f32d1a399633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7498b72870ec8b7ec414c06e3b926fd05682bb18 +refs/heads/master: 9615b7318eaacb9a3545284130eed55865e5fb1c diff --git a/trunk/arch/arm/mach-s3c24xx/mach-nexcoder.c b/trunk/arch/arm/mach-s3c24xx/mach-nexcoder.c index 5198e3e1c5be..5c05ba1c330f 100644 --- a/trunk/arch/arm/mach-s3c24xx/mach-nexcoder.c +++ b/trunk/arch/arm/mach-s3c24xx/mach-nexcoder.c @@ -84,11 +84,7 @@ static struct s3c2410_uartcfg nexcoder_uartcfgs[] __initdata = { /* NOR Flash on NexVision NexCoder 2440 board */ static struct resource nexcoder_nor_resource[] = { - [0] = { - .start = S3C2410_CS0, - .end = S3C2410_CS0 + (8*1024*1024) - 1, - .flags = IORESOURCE_MEM, - } + [0] = DEFINE_RES_MEM(S3C2410_CS0, SZ_8M), }; static struct map_info nexcoder_nor_map = {