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

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

diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index 200debb4c72dff3eea29f6cfe2af32dda0b373b3..a6762aae4727f0289724ac1746aa2b3adaf63a7b 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -152,13 +152,8 @@ static struct pda_power_pdata power_supply_info = {
 };
 
 static struct resource power_supply_resources[] = {
-       [0] = {
-                       .name   = "ac",
-                       .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE |
-                                         IORESOURCE_IRQ_HIGHEDGE,
-                       .start  = IRQ_EINT2,
-                       .end    = IRQ_EINT2,
-       },
+       [0] = DEFINE_RES_NAMED(IRQ_EINT2, 1, "ac", IORESOURCE_IRQ \
+                       | IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE),
 };
 
 static struct platform_device power_supply = {