2 files changed, 4 insertions, 8 deletions

diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 64792f67866..4664bd11adc 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -96,8 +96,8 @@ struct platform_device s3c_device_lcd = {
         .num_resources    = ARRAY_SIZE(s3c_lcd_resource),
         .resource         = s3c_lcd_resource,
         .dev              = {
-                .dma_mask = &s3c_device_lcd_dmamask,
-                .coherent_dma_mask = 0xffffffffUL
+                .dma_mask               = &s3c_device_lcd_dmamask,
+                .coherent_dma_mask      = 0xffffffffUL
         }
 };
 
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index 76be074944a..1db2855e3e5 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -371,16 +371,12 @@ void __init vr1000_map_io(void)
         usb_simtec_init();
 }
 
-void __init vr1000_init_irq(void)
-{
-        s3c24xx_init_irq();
-}
 
 MACHINE_START(VR1000, "Thorcom-VR1000")
      MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
      BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
      BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
-     MAPIO(vr1000_map_io)
-     INITIRQ(vr1000_init_irq)
+        .map_io         = vr1000_map_io,
+        .init_irq       = s3c24xx_init_irq,
         .timer          = &s3c24xx_timer,
 MACHINE_END