diff options
author | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2007-05-12 20:28:05 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-05-14 09:18:35 +0900 |
commit | 049fa57ce3b22d9f5acb251070941b630ee71d6e (patch) | |
tree | 4a75949aae927e47b6ae00460cfa53b80e6cfbe2 /drivers/input | |
parent | ad05acd6e95e99f56da304ec3566d81061ab67f9 (diff) |
input: hp680_ts compile fixes.
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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index 61c15024c2a0..1a15475aedfc 100644 --- a/drivers/input/touchscreen/hp680_ts_input.c +++ b/drivers/input/touchscreen/hp680_ts_input.c @@ -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> @@ -18,12 +17,12 @@ #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; |