Fixes: 38c795d ("backport: HID: wacom: Improve generic name generation")
Signed-off-by: Jason Gerecke <[email protected]>
---
2.6.30/wacom_wac.c | 2 +-
2.6.38/wacom_wac.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index cab65cf..91b464e 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2563,7 +2563,7 @@ static const struct wacom_features wacom_features_0x354 =
static const struct wacom_features wacom_features_0x357 =
{ "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191, 63,
INTUOSP2, 9 };
static const struct wacom_features wacom_features_0x358 =
- { "Wacom Wacom Intuos Pro L", WACOM_PKGLEN_INTUOSP2, 62200, 43200,
8191, 63, INTUOSP2, 9 };
+ { "Wacom Intuos Pro L", WACOM_PKGLEN_INTUOSP2, 62200, 43200, 8191, 63,
INTUOSP2, 9 };
static const struct wacom_features wacom_features_0x35A =
{ "Wacom DTH-1152", WACOM_PKGLEN_DTH1152, 22320, 12555, 1024,
0, DTH1152, .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x368 };
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index cf94c0f..46c1d4c 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -3244,10 +3244,10 @@ static const struct wacom_features wacom_features_0x354
=
{ "Wacom Cintiq Pro 16UHD Touch", WACOM_PKGLEN_MSPROT, .type =
WACOM_MSPROT,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x350 }; /* Touch */
static const struct wacom_features wacom_features_0x357 =
- { "Wacom Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191,
+ { "Wacom Intuos Pro M", WACOM_PKGLEN_INTUOSP2, 44800, 29600, 8191,
63, INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max =
10 };
static const struct wacom_features wacom_features_0x358 =
- { "Wacom Wacom Intuos Pro L", WACOM_PKGLEN_INTUOSP2, 62200, 43200, 8191,
+ { "Wacom Intuos Pro L", WACOM_PKGLEN_INTUOSP2, 62200, 43200, 8191,
63, INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max =
10 };
static const struct wacom_features wacom_features_0x35A =
{ "Wacom DTH-1152", WACOM_PKGLEN_DTH1152, 22320, 12555, 1024,
--
2.14.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
