]> err.no Git - linux-2.6/commitdiff
input: hp680_ts compile fixes.
authorKristoffer Ericson <kristoffer.ericson@gmail.com>
Sat, 12 May 2007 11:28:05 +0000 (20:28 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 14 May 2007 00:18:35 +0000 (09:18 +0900)
Trivial fix to follow the DECLARE_WORK changes, this makes the HD64461
touchscreen driver work properly again. As pointed out by David Howells.

Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/input/touchscreen/hp680_ts_input.c

index 61c15024c2a0e0ef87738239028500338cd185cd..1a15475aedfcc269d5bbfc033c15db3025a3dd5b 100644 (file)
@@ -1,7 +1,6 @@
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 #define        PHDR    0xa400012e
 #define SCPDR  0xa4000136
 
-static void do_softint(void *data);
+static void do_softint(struct work_struct *work);
 
 static struct input_dev *hp680_ts_dev;
-static DECLARE_WORK(work, do_softint);
+static DECLARE_DELAYED_WORK(work, do_softint);
 
-static void do_softint(void *data)
+static void do_softint(struct work_struct *work)
 {
        int absx = 0, absy = 0;
        u8 scpdr;