On Wed, Apr 13, 2011 at 08:52:09PM -0500, Chris Bagwell wrote: > Reviewed-by: Chris Bagwell <[email protected]> > > > On Wed, Apr 13, 2011 at 5:43 PM, Ping Cheng <[email protected]> wrote: > > 9F and E2 are touch only devices, for which we need to retrieve > > the resolution from the kernel. So, the resolution defined in > > WacomModelDesc does not count for anything. However, to avoid > > future questions about the weird "394", align them with their > > cousins. > > > > Signed-off-by: Ping Cheng <[email protected]> > > --- > > src/wcmUSB.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/wcmUSB.c b/src/wcmUSB.c > > index 2c2eb32..23c07ab 100644 > > --- a/src/wcmUSB.c > > +++ b/src/wcmUSB.c > > @@ -266,8 +266,8 @@ static struct > > { WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC }, /* > > TabletPC 0x90 */ > > { WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC }, /* > > TabletPC 0x93 */ > > { WACOM_VENDOR_ID, 0x9A, 100000, 100000, &usbTabletPC }, /* > > TabletPC 0x9A */ > > - { WACOM_VENDOR_ID, 0x9F, 394, 394, &usbTabletPC }, /* > > CapPlus 0x9F */ > > - { WACOM_VENDOR_ID, 0xE2, 394, 394, &usbTabletPC }, /* > > TabletPC 0xE2 */ > > + { WACOM_VENDOR_ID, 0x9F, 100000, 100000, &usbTabletPC }, /* > > CapPlus 0x9F */ > > + { WACOM_VENDOR_ID, 0xE2, 100000, 100000, &usbTabletPC }, /* > > TabletPC 0xE2 */ > > { WACOM_VENDOR_ID, 0xE3, 100000, 100000, &usbTabletPC }, /* > > TabletPC 0xE3 */ > > { WACOM_VENDOR_ID, 0xE6, 100000, 100000, &usbTabletPC }, /* > > TabletPC 0xE6 */ > > > > -- > > 1.7.4.2
merged, thanks. Cheers, Peter ------------------------------------------------------------------------------ Benefiting from Server Virtualization: Beyond Initial Workload Consolidation -- Increasing the use of server virtualization is a top priority.Virtualization can reduce costs, simplify management, and improve application availability and disaster protection. Learn more about boosting the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
