Moves the definition of the 2nd-gen Intuos Pro tablets to occur after the
MobileStudio Pro. Somehow these were misplaced in the 2.6.38 and 3.7 trees
(the 2.6.30 and 2.6.36 trees are already properly ordered).
Signed-off-by: Ping Cheng <pi...@wacom.com>
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.38/wacom_wac.c | 12 ++++++------
3.7/wacom_wac.c | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index 2f12258..99f59e1 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -3143,18 +3143,18 @@ static const struct wacom_features wacom_features_0x34D
=
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34A };
-static const struct wacom_features wacom_features_0x357 =
- { "Wacom Co,.Ltd. 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 Co,.Ltd. 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_0x34E =
{ "Wacom MobileStudio Pro 16", WACOM_PKGLEN_MSPRO, 69920, 39680, 8191,
63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 13,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34B };
+static const struct wacom_features wacom_features_0x357 =
+ { "Wacom Co,.Ltd. 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 Co,.Ltd. Wacom Intuos Pro L", WACOM_PKGLEN_INTUOSP2, 62200,
43200, 8191,
+ 63, INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max =
10 };
#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index 3effd1d..697f53e 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -3082,18 +3082,18 @@ static const struct wacom_features wacom_features_0x34D
=
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34A };
-static const struct wacom_features wacom_features_0x357 =
- { "Wacom Co,.Ltd. 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 Co,.Ltd. 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_0x34E =
{ "Wacom MobileStudio Pro 16", WACOM_PKGLEN_MSPRO, 69920, 39680, 8191,
63,
WACOM_MSPRO, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 13,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x34B };
+static const struct wacom_features wacom_features_0x357 =
+ { "Wacom Co,.Ltd. 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 Co,.Ltd. Wacom Intuos Pro L", WACOM_PKGLEN_INTUOSP2, 62200,
43200, 8191,
+ 63, INTUOSP2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max =
10 };
#define USB_DEVICE_WACOM(prod) \
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
--
2.12.0
------------------------------------------------------------------------------
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
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
