Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events

[safe/jmp/linux-2.6] / drivers / input / touchscreen / mainstone-wm97xx.c

diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index 09ec98f..dfa6a84 100644 (file)
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -24,7 +24,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -32,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/wm97xx.h>
 #include <linux/io.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/regs-ac97.h>
 
 #define VERSION                "0.13"
 
@@ -163,6 +162,7 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm)
                input_report_abs(wm->input_dev, ABS_X, x & 0xfff);
                input_report_abs(wm->input_dev, ABS_Y, y & 0xfff);
                input_report_abs(wm->input_dev, ABS_PRESSURE, p & 0xfff);
+               input_report_key(wm->input_dev, BTN_TOUCH, (p != 0));
                input_sync(wm->input_dev);
                reads++;
        } while (reads < cinfo[sp_idx].reads);
@@ -246,7 +246,7 @@ static void wm97xx_irq_enable(struct wm97xx *wm, int enable)
        if (enable)
                enable_irq(wm->pen_irq);
        else
-               disable_irq(wm->pen_irq);
+               disable_irq_nosync(wm->pen_irq);
 }
 
 static struct wm97xx_mach_ops mainstone_mach_ops = {