Merge branch 'for-next' of git://neil.brown.name/md

[~andy/linux] / drivers / input / tablet / wacom_wac.h

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 78fbd3f420095c6279644f3a11d789c87bb960cc..96c185cc301eb95bf062440e59c49114458c0028 100644 (file)
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -48,6 +48,7 @@
 #define WACOM_REPORT_TPCMT             13
 #define WACOM_REPORT_TPCHID            15
 #define WACOM_REPORT_TPCST             16
+#define WACOM_REPORT_TPC1FGE           18
 
 /* device quirks */
 #define WACOM_QUIRK_MULTI_INPUT                0x0001
@@ -62,8 +63,6 @@ enum {
        PTU,
        PL,
        DTU,
-       BAMBOO_PT,
-       WIRELESS,
        INTUOS,
        INTUOS3S,
        INTUOS3,
@@ -74,12 +73,16 @@ enum {
        INTUOS5S,
        INTUOS5,
        INTUOS5L,
-       WACOM_24HD,
        WACOM_21UX2,
+       WACOM_22HD,
+       WACOM_24HD,
        CINTIQ,
        WACOM_BEE,
        WACOM_MO,
-       TABLETPC,
+       WIRELESS,
+       BAMBOO_PT,
+       TABLETPC,   /* add new TPC below */
+       TABLETPCE,
        TABLETPC2FG,
        MTSCREEN,
        MAX_TYPE