Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / input / tablet / wacom_wac.h

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index b1310ec..53eb71b 100644 (file)
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -74,6 +74,8 @@ struct wacom_features {
        int pressure_max;
        int distance_max;
        int type;
+       int x_resolution;
+       int y_resolution;
        int device_type;
        int x_phy;
        int y_phy;
@@ -88,15 +90,15 @@ struct wacom_features {
 
 struct wacom_shared {
        bool stylus_in_proximity;
+       bool touch_down;
 };
 
 struct wacom_wac {
        char name[64];
        unsigned char *data;
-       int tool[3];
-       int id[3];
+       int tool[2];
+       int id[2];
        __u32 serial[2];
-       int last_finger;
        struct wacom_features features;
        struct wacom_shared *shared;
        struct input_dev *input;