Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/drivers/usb/input/wacom_wac.h b/drivers/usb/input/wacom_wac.h
index ceae7bf59d9f8b13a19c26403a5cf3661aa6e1cd..a23022287248e12805f1250de2f0a41c3a079ae8 100644 (file)
--- a/drivers/usb/input/wacom_wac.h
+++ b/drivers/usb/input/wacom_wac.h
@@ -12,6 +12,7 @@
 #define STYLUS_DEVICE_ID       0x02
 #define CURSOR_DEVICE_ID       0x06
 #define ERASER_DEVICE_ID       0x0A
+#define PAD_DEVICE_ID          0x0F
 
 enum {
        PENPARTNER = 0,
@@ -20,6 +21,7 @@ enum {
        PTU,
        PL,
        INTUOS,
+       INTUOS3S,
        INTUOS3,
        INTUOS3L,
        CINTIQ,
@@ -34,7 +36,6 @@ struct wacom_features {
        int pressure_max;
        int distance_max;
        int type;
-       usb_complete_t irq;
 };
 
 struct wacom_wac {