diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 06:48:21 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 06:48:21 +0900 |
| commit | 2870f5352451a99a364a807803e4c39477264c3c (patch) | |
| tree | 11ee9795559bdc9645a0a17815611c624066c515 /arch/arm/mach-exynos/mach-armlex4210.c | |
| parent | 06c77b3ce1b81163d74d9d5e904de731934e8510 (diff) | |
| parent | 5fdbdd1d4b9ec58e51092e24c231a303b38cdb94 (diff) | |
| download | linux-3.10-2870f5352451a99a364a807803e4c39477264c3c.tar.gz linux-3.10-2870f5352451a99a364a807803e4c39477264c3c.tar.bz2 linux-3.10-2870f5352451a99a364a807803e4c39477264c3c.zip | |
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
Diffstat (limited to 'arch/arm/mach-exynos/mach-armlex4210.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-armlex4210.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/mach-exynos/mach-armlex4210.c b/arch/arm/mach-exynos/mach-armlex4210.c index a1e70070afd..fed7116418e 100644 --- a/arch/arm/mach-exynos/mach-armlex4210.c +++ b/arch/arm/mach-exynos/mach-armlex4210.c @@ -118,16 +118,9 @@ static void __init armlex4210_wlan_init(void) } static struct resource armlex4210_smsc911x_resources[] = { - [0] = { - .start = EXYNOS4_PA_SROM_BANK(3), - .end = EXYNOS4_PA_SROM_BANK(3) + SZ_64K - 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_EINT(27), - .end = IRQ_EINT(27), - .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, - }, + [0] = DEFINE_RES_MEM(EXYNOS4_PA_SROM_BANK(3), SZ_64K), + [1] = DEFINE_RES_NAMED(IRQ_EINT(27), 1, NULL, IORESOURCE_IRQ \ + | IRQF_TRIGGER_HIGH), }; static struct smsc911x_platform_config smsc9215_config = { |