Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / mach-s3c24xx / mach-mini2440.c

diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 5d66fb218a41bcb121c5845e201009ffe0a0bbab..f092b188ab70afba8e3012aad0b717c9936b97be 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -292,21 +292,10 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
 /* DM9000AEP 10/100 ethernet controller */
 
 static struct resource mini2440_dm9k_resource[] = {
-       [0] = {
-               .start = MACH_MINI2440_DM9K_BASE,
-               .end   = MACH_MINI2440_DM9K_BASE + 3,
-               .flags = IORESOURCE_MEM
-       },
-       [1] = {
-               .start = MACH_MINI2440_DM9K_BASE + 4,
-               .end   = MACH_MINI2440_DM9K_BASE + 7,
-               .flags = IORESOURCE_MEM
-       },
-       [2] = {
-               .start = IRQ_EINT7,
-               .end   = IRQ_EINT7,
-               .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
-       }
+       [0] = DEFINE_RES_MEM(MACH_MINI2440_DM9K_BASE, 4),
+       [1] = DEFINE_RES_MEM(MACH_MINI2440_DM9K_BASE + 4, 4),
+       [2] = DEFINE_RES_NAMED(IRQ_EINT7, 1, NULL, IORESOURCE_IRQ \
+                                               | IORESOURCE_IRQ_HIGHEDGE),
 };
 
 /*