summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx/simtec-nor.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-12 21:48:21 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2012-05-12 21:48:21 (GMT)
commit2870f5352451a99a364a807803e4c39477264c3c (patch)
tree11ee9795559bdc9645a0a17815611c624066c515 /arch/arm/mach-s3c24xx/simtec-nor.c
parent06c77b3ce1b81163d74d9d5e904de731934e8510 (diff)
parent5fdbdd1d4b9ec58e51092e24c231a303b38cdb94 (diff)
downloadlinux-2870f5352451a99a364a807803e4c39477264c3c.tar.xz
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
Diffstat (limited to 'arch/arm/mach-s3c24xx/simtec-nor.c')
-rw-r--r--arch/arm/mach-s3c24xx/simtec-nor.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c24xx/simtec-nor.c b/arch/arm/mach-s3c24xx/simtec-nor.c
index b9d6d4f..029744fc 100644
--- a/arch/arm/mach-s3c24xx/simtec-nor.c
+++ b/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 = {