The 2.6.36 kernel removed the "abs" member from "struct input_dev". Two
other blocks in the 2.6.30 tree already have surrounding #if guards to
ensure we don't try to reference "abs", but one is missing the guard.

Curiously, the guards check for a kernel earlier than 2.6.35 rather than
2.6.36. We'll follow that convention even though its not correct...

Ref: 898e7d46f8 ("Add Intous5 touch support in 2.6.30+")
Fixes: 126ec2dd60 ("Add support to ISDV4 0x100 and 0x101")
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
 2.6.30/wacom_wac.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 5aeb183..72c5f65 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1217,6 +1217,7 @@ static void wacom_tpc_mt(struct wacom_wac *wacom)
                                int x = get_unaligned_le16(&data[offset + 
x_offset + 7]);
                                int y = get_unaligned_le16(&data[offset + 
x_offset + 9]);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
                                if (wacom->last_finger == id) {
                                        if (x == input->abs[ABS_X])
                                                x++;
@@ -1224,6 +1225,7 @@ static void wacom_tpc_mt(struct wacom_wac *wacom)
                                        if (y == input->abs[ABS_Y])
                                                y++;
                                }
+#endif
 
                                wacom->id[slot+1] = touch;
                                if (!wacom->id[1] && !wacom->id[2])
-- 
2.16.0


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to