On Thu, Jul 12, 2012 at 05:23:00PM -0700, Ping Cheng wrote:
> Signed-off-by: Ping Cheng <pingli...@gmail.com>
> ---
5d85fe2..1a8db01 master -> master
thanks. btw, I recommend setting
[format]
subjectprefix = "PATCH xf86-input-wacom"
in your .git/config file for this repo. this way git-format-patch adds it
automatically and it gets removed when merging. (same goes for libwacom)
Cheers,
Peter
> src/wcmUSB.c | 1 +
> src/wcmValidateDevice.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index 47c8964..3ee5d8f 100644
> --- a/src/wcmUSB.c
> +++ b/src/wcmUSB.c
> @@ -276,6 +276,7 @@ static struct
> { WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 12WX */
> { WACOM_VENDOR_ID, 0xCC, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 21UX2 */
> { WACOM_VENDOR_ID, 0xF4, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 24HD */
> + { WACOM_VENDOR_ID, 0xFA, 200000, 200000, &usbCintiqV5 }, /* Cintiq
> 22HD */
>
> { WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC }, /* TabletPC
> 0x90 */
> { WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC }, /* TabletPC
> 0x93 */
> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
> index 119539d..6c08c45 100644
> --- a/src/wcmValidateDevice.c
> +++ b/src/wcmValidateDevice.c
> @@ -254,6 +254,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
> case 0xC5: /* CintiqV5 */
> case 0xC6: /* CintiqV5 */
> case 0xCC: /* CinitqV5 */
> + case 0xFA: /* Cintiq 22HD */
> TabletSetFeature(priv->common, WCM_LCD);
> /* fall through */
> case 0xB0: /* I3 */
> --
> 1.7.7.6
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
