Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / input / tablet / wacom_wac.h

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 00ca01541d89e86e210c34efc184e3b385dee096..b1310ec9720c0613ab6a219cbe421d6e6eb62241 100644 (file)
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -42,9 +42,6 @@
 #define WACOM_QUIRK_MULTI_INPUT                0x0001
 #define WACOM_QUIRK_BBTOUCH_LOWRES     0x0002
 
-/* largest reported tracking id */
-#define MAX_TRACKING_ID                        0xfff
-
 enum {
        PENPARTNER = 0,
        GRAPHIRE,
@@ -100,7 +97,6 @@ struct wacom_wac {
        int id[3];
        __u32 serial[2];
        int last_finger;
-       int trk_id;
        struct wacom_features features;
        struct wacom_shared *shared;
        struct input_dev *input;