aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/mach-smdkv310.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-12 17:48:21 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-12 17:48:21 -0400
commit2870f5352451a99a364a807803e4c39477264c3c (patch)
tree11ee9795559bdc9645a0a17815611c624066c515 /arch/arm/mach-exynos/mach-smdkv310.c
parent06c77b3ce1b81163d74d9d5e904de731934e8510 (diff)
parent5fdbdd1d4b9ec58e51092e24c231a303b38cdb94 (diff)
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdkv310.c')
-rw-r--r--arch/arm/mach-exynos/mach-smdkv310.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index f08529f9cdf6..ea39f614f2db 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -179,16 +179,9 @@ static struct s3c_fb_platdata smdkv310_lcd0_pdata __initdata = {
179}; 179};
180 180
181static struct resource smdkv310_smsc911x_resources[] = { 181static struct resource smdkv310_smsc911x_resources[] = {
182 [0] = { 182 [0] = DEFINE_RES_MEM(EXYNOS4_PA_SROM_BANK(1), SZ_64K),
183 .start = EXYNOS4_PA_SROM_BANK(1), 183 [1] = DEFINE_RES_NAMED(IRQ_EINT(5), 1, NULL, IORESOURCE_IRQ \
184 .end = EXYNOS4_PA_SROM_BANK(1) + SZ_64K - 1, 184 | IRQF_TRIGGER_LOW),
185 .flags = IORESOURCE_MEM,
186 },
187 [1] = {
188 .start = IRQ_EINT(5),
189 .end = IRQ_EINT(5),
190 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
191 },
192}; 185};
193 186
194static struct smsc911x_platform_config smsc9215_config = { 187static struct smsc911x_platform_config smsc9215_config = {