diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 23:48:21 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 23:48:21 +0200 |
| commit | 2870f5352451a99a364a807803e4c39477264c3c (patch) | |
| tree | 11ee9795559bdc9645a0a17815611c624066c515 /arch/arm/plat-samsung/devs.c | |
| parent | ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable (diff) | |
| parent | ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c (diff) | |
| download | linux-2870f5352451a99a364a807803e4c39477264c3c.tar.xz linux-2870f5352451a99a364a807803e4c39477264c3c.zip | |
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
Diffstat (limited to 'arch/arm/plat-samsung/devs.c')
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index db32ec5a7eb7..1013a341b0fd 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -272,16 +272,8 @@ struct platform_device s5p_device_fimc3 = { #ifdef CONFIG_S5P_DEV_G2D static struct resource s5p_g2d_resource[] = { - [0] = { - .start = S5P_PA_G2D, - .end = S5P_PA_G2D + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_2D, - .end = IRQ_2D, - .flags = IORESOURCE_IRQ, - }, + [0] = DEFINE_RES_MEM(S5P_PA_G2D, SZ_4K), + [1] = DEFINE_RES_IRQ(IRQ_2D), }; struct platform_device s5p_device_g2d = { |