Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6

[pandora-kernel.git] / arch / arm / mach-s3c64xx / mach-anw6410.c

diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 58fd0e3..ffa29dd 100644 (file)
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -168,21 +168,10 @@ static void __init anw6410_dm9000_enable(void)
 }
 
 static struct resource anw6410_dm9000_resource[] = {
-       [0] = {
-               .start = ANW6410_PA_DM9000,
-               .end   = ANW6410_PA_DM9000 + 3,
-               .flags = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start = ANW6410_PA_DM9000 + 4,
-               .end   = ANW6410_PA_DM9000 + 4 + 500,
-               .flags = IORESOURCE_MEM,
-       },
-       [2] = {
-               .start = IRQ_EINT(15),
-               .end   = IRQ_EINT(15),
-               .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH,
-       },
+       [0] = DEFINE_RES_MEM(ANW6410_PA_DM9000, 4),
+       [1] = DEFINE_RES_MEM(ANW6410_PA_DM9000 + 4, 501),
+       [2] = DEFINE_RES_NAMED(IRQ_EINT(15), 1, NULL, IORESOURCE_IRQ \
+                                       | IRQF_TRIGGER_HIGH),
 };
 
 static struct dm9000_plat_data anw6410_dm9000_pdata = {
@@ -244,6 +233,7 @@ MACHINE_START(ANW6410, "A&W6410")
        .handle_irq     = vic_handle_irq,
        .map_io         = anw6410_map_io,
        .init_machine   = anw6410_machine_init,
+       .init_late      = s3c64xx_init_late,
        .timer          = &s3c24xx_timer,
        .restart        = s3c64xx_restart,
 MACHINE_END