vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-pxa / idp.c

diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index db53cd5..4333a0f 100644 (file)
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -27,6 +27,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/pxa-regs.h>
 #include <asm/arch/idp.h>
 
 #include "generic.h"
@@ -100,7 +101,7 @@ static void __init idp_map_io(void)
        pxa_map_io();
        iotable_init(idp_io_desc, ARRAY_SIZE(idp_io_desc));
 
-       set_irq_type(IRQ_TO_GPIO_2_80(TOUCH_PANEL_IRQ), TOUCH_PANEL_IRQ_EDGE);
+       set_irq_type(TOUCH_PANEL_IRQ, TOUCH_PANEL_IRQ_EDGE);
 
        // serial ports 2 & 3
        pxa_gpio_mode(GPIO42_BTRXD_MD);
@@ -118,6 +119,6 @@ MACHINE_START(PXA_IDP, "Accelent Xscale IDP")
        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
        MAPIO(idp_map_io)
        INITIRQ(idp_init_irq)
-       INITTIME(pxa_init_time)
+       .timer          = &pxa_timer,
        INIT_MACHINE(idp_init)
 MACHINE_END