1 files changed, 10 insertions, 13 deletions

diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 815c53225cd8..a10268618f74 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -32,10 +32,7 @@
 
 extern void rpc_init_irq(void);
 
-extern unsigned int vram_size;
-
-#if 0
-
+unsigned int vram_size;
 unsigned int memc_ctrl_reg;
 unsigned int number_mfm_drives;
 
@@ -63,8 +60,6 @@ static int __init parse_tag_acorn(const struct tag *tag)
 
 __tagtable(ATAG_ACORN, parse_tag_acorn);
 
-#endif
-
 static struct map_desc rpc_io_desc[] __initdata = {
  { SCREEN_BASE, SCREEN_START,   2*1048576, MT_DEVICE }, /* VRAM         */
  { (u32)IO_BASE, IO_START,      IO_SIZE  , MT_DEVICE }, /* IO space     */
@@ -168,12 +163,14 @@ arch_initcall(rpc_init);
 extern struct sys_timer ioc_timer;
 
 MACHINE_START(RISCPC, "Acorn-RiscPC")
-        MAINTAINER("Russell King")
-        BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
-        BOOT_PARAMS(0x10000100)
-        DISABLE_PARPORT(0)
-        DISABLE_PARPORT(1)
-        MAPIO(rpc_map_io)
-        INITIRQ(rpc_init_irq)
+        /* Maintainer: Russell King */
+        .phys_ram       = 0x10000000,
+        .phys_io        = 0x03000000,
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
+        .boot_params    = 0x10000100,
+        .reserve_lp0    = 1,
+        .reserve_lp1    = 1,
+        .map_io         = rpc_map_io,
+        .init_irq       = rpc_init_irq,
         .timer          = &ioc_timer,
 MACHINE_END