aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/wacom_wac.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index b65e0d7cd7e5..7b7a61a9194d 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2685,11 +2685,11 @@ static const struct wacom_features wacom_features_0x317 =
2685 INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16, 2685 INTUOSPL, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, .touch_max = 16,
2686 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE }; 2686 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
2687static const struct wacom_features wacom_features_0xF4 = 2687static const struct wacom_features wacom_features_0xF4 =
2688 { "Wacom Cintiq 24HD", 104280, 65400, 2047, 63, 2688 { "Wacom Cintiq 24HD", 104080, 65200, 2047, 63,
2689 WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2689 WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2690 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET }; 2690 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
2691static const struct wacom_features wacom_features_0xF8 = 2691static const struct wacom_features wacom_features_0xF8 =
2692 { "Wacom Cintiq 24HD touch", 104280, 65400, 2047, 63, /* Pen */ 2692 { "Wacom Cintiq 24HD touch", 104080, 65200, 2047, 63, /* Pen */
2693 WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2693 WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2694 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET, 2694 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
2695 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 }; 2695 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
@@ -2707,7 +2707,7 @@ static const struct wacom_features wacom_features_0xC6 =
2707 { "Wacom Cintiq 12WX", 53020, 33440, 1023, 63, 2707 { "Wacom Cintiq 12WX", 53020, 33440, 1023, 63,
2708 WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES }; 2708 WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
2709static const struct wacom_features wacom_features_0x304 = 2709static const struct wacom_features wacom_features_0x304 =
2710 { "Wacom Cintiq 13HD", 59352, 33648, 1023, 63, 2710 { "Wacom Cintiq 13HD", 59152, 33448, 1023, 63,
2711 WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2711 WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2712 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET }; 2712 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
2713static const struct wacom_features wacom_features_0xC7 = 2713static const struct wacom_features wacom_features_0xC7 =
@@ -2721,7 +2721,7 @@ static const struct wacom_features wacom_features_0xF0 =
2721 { "Wacom DTU1631", 34623, 19553, 511, 0, 2721 { "Wacom DTU1631", 34623, 19553, 511, 0,
2722 DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; 2722 DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
2723static const struct wacom_features wacom_features_0xFB = 2723static const struct wacom_features wacom_features_0xFB =
2724 { "Wacom DTU1031", 22096, 13960, 511, 0, 2724 { "Wacom DTU1031", 21896, 13760, 511, 0,
2725 DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 2725 DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
2726 WACOM_DTU_OFFSET, WACOM_DTU_OFFSET }; 2726 WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
2727static const struct wacom_features wacom_features_0x32F = 2727static const struct wacom_features wacom_features_0x32F =
@@ -2742,15 +2742,15 @@ static const struct wacom_features wacom_features_0x5D = /* Touch */
2742 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x59, .touch_max = 10, 2742 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x59, .touch_max = 10,
2743 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE }; 2743 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
2744static const struct wacom_features wacom_features_0xCC = 2744static const struct wacom_features wacom_features_0xCC =
2745 { "Wacom Cintiq 21UX2", 87000, 65400, 2047, 63, 2745 { "Wacom Cintiq 21UX2", 86800, 65200, 2047, 63,
2746 WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2746 WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2747 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET }; 2747 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
2748static const struct wacom_features wacom_features_0xFA = 2748static const struct wacom_features wacom_features_0xFA =
2749 { "Wacom Cintiq 22HD", 95640, 54060, 2047, 63, 2749 { "Wacom Cintiq 22HD", 95440, 53860, 2047, 63,
2750 WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2750 WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2751 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET }; 2751 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
2752static const struct wacom_features wacom_features_0x5B = 2752static const struct wacom_features wacom_features_0x5B =
2753 { "Wacom Cintiq 22HDT", 95640, 54060, 2047, 63, 2753 { "Wacom Cintiq 22HDT", 95440, 53860, 2047, 63,
2754 WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2754 WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2755 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET, 2755 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
2756 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e }; 2756 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
@@ -2897,7 +2897,7 @@ static const struct wacom_features wacom_features_0x6004 =
2897 { "ISD-V4", 12800, 8000, 255, 0, 2897 { "ISD-V4", 12800, 8000, 255, 0,
2898 TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; 2898 TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
2899static const struct wacom_features wacom_features_0x307 = 2899static const struct wacom_features wacom_features_0x307 =
2900 { "Wacom ISDv5 307", 59352, 33648, 2047, 63, 2900 { "Wacom ISDv5 307", 59152, 33448, 2047, 63,
2901 CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2901 CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2902 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET, 2902 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
2903 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 }; 2903 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };
@@ -2906,7 +2906,7 @@ static const struct wacom_features wacom_features_0x309 =
2906 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10, 2906 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,
2907 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE }; 2907 .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
2908static const struct wacom_features wacom_features_0x30A = 2908static const struct wacom_features wacom_features_0x30A =
2909 { "Wacom ISDv5 30A", 59352, 33648, 2047, 63, 2909 { "Wacom ISDv5 30A", 59152, 33448, 2047, 63,
2910 CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 2910 CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
2911 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET, 2911 WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
2912 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C }; 2912 .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };