[ARM] 3697/1: ARM: Convert shark to generic irq handling

[linux-2.6] / arch / arm / mach-shark / core.c

diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index e737eae4521f6fe5b7a8a58abb26c7a9be5b2a6c..2f2c6e97b7a345cacf3e00ad9050815382624953 100644 (file)
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/serial_8250.h>
 
@@ -41,7 +42,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
        .name                   = "serial8250",
-       .id                     = 0,
+       .id                     = PLAT8250_DEV_PLATFORM,
        .dev                    = {
                .platform_data  = serial_platform_data,
        },
@@ -62,7 +63,12 @@ arch_initcall(shark_init);
 extern void shark_init_irq(void);
 
 static struct map_desc shark_io_desc[] __initdata = {
-       { IO_BASE       , IO_START      , IO_SIZE       , MT_DEVICE }
+       {
+               .virtual        = IO_BASE,
+               .pfn            = __phys_to_pfn(IO_START),
+               .length         = IO_SIZE,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init shark_map_io(void)
@@ -106,7 +112,6 @@ static struct sys_timer shark_timer = {
 
 MACHINE_START(SHARK, "Shark")
        /* Maintainer: Alexander Schulz */
-       .phys_ram       = 0x08000000,
        .phys_io        = 0x40000000,
        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
        .boot_params    = 0x08003000,