diff options
author | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2007-05-12 07:28:05 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-05-13 20:18:35 -0400 |
commit | 049fa57ce3b22d9f5acb251070941b630ee71d6e (patch) | |
tree | 4a75949aae927e47b6ae00460cfa53b80e6cfbe2 /drivers/input/touchscreen | |
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/touchscreen')
-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 @@ | |||
1 | #include <linux/input.h> | 1 | #include <linux/input.h> |
2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
3 | #include <linux/init.h> | 3 | #include <linux/init.h> |
4 | |||
5 | #include <linux/interrupt.h> | 4 | #include <linux/interrupt.h> |
6 | #include <asm/io.h> | 5 | #include <asm/io.h> |
7 | #include <asm/delay.h> | 6 | #include <asm/delay.h> |
@@ -18,12 +17,12 @@ | |||
18 | #define PHDR 0xa400012e | 17 | #define PHDR 0xa400012e |
19 | #define SCPDR 0xa4000136 | 18 | #define SCPDR 0xa4000136 |
20 | 19 | ||
21 | static void do_softint(void *data); | 20 | static void do_softint(struct work_struct *work); |
22 | 21 | ||
23 | static struct input_dev *hp680_ts_dev; | 22 | static struct input_dev *hp680_ts_dev; |
24 | static DECLARE_WORK(work, do_softint); | 23 | static DECLARE_DELAYED_WORK(work, do_softint); |
25 | 24 | ||
26 | static void do_softint(void *data) | 25 | static void do_softint(struct work_struct *work) |
27 | { | 26 | { |
28 | int absx = 0, absy = 0; | 27 | int absx = 0, absy = 0; |
29 | u8 scpdr; | 28 | u8 scpdr; |