Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / input / touchscreen / hp680_ts_input.c

diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index ee6c2f40cdf6d6c5ca14603ace5e7d69a6e7029d..58fca316786c274a8d5ef473abd7ad12414b4642 100644 (file)
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -6,7 +6,7 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/adc.h>
-#include <asm/hp6xx/hp6xx.h>
+#include <asm/hp6xx.h>
 
 #define MODNAME "hp680_ts_input"
 
@@ -66,7 +66,7 @@ static void do_softint(void *data)
        enable_irq(HP680_TS_IRQ);
 }
 
-static irqreturn_t hp680_ts_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t hp680_ts_interrupt(int irq, void *dev)
 {
        disable_irq_nosync(irq);
        schedule_delayed_work(&work, HZ / 20);