rpms/kernel/FC-4 linux-2.6-usbhid-wacom.patch, NONE, 1.1 kernel-2.6.spec, 1.1543, 1.1544

Tue Dec 27 23:31:40 UTC 2005

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23268

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-usbhid-wacom.patch 
Log Message:
* Tue Dec 27 2005 Dave Jones <davej at redhat.com>
- usbhid incorrectly claimed wacom penpartner tablet. (#161241)


linux-2.6-usbhid-wacom.patch:
 hid-core.c |    1 +
 wacom.c    |    2 ++
 2 files changed, 3 insertions(+)

--- NEW FILE linux-2.6-usbhid-wacom.patch ---
--- linux-2.6.14/drivers/usb/input/hid-core.c~	2005-12-27 18:26:21.000000000 -0500
+++ linux-2.6.14/drivers/usb/input/hid-core.c	2005-12-27 18:26:34.000000000 -0500
@@ -1534,6 +1534,7 @@ static struct hid_blacklist {
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 5, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 7, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 1, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PTU, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 1, HID_QUIRK_IGNORE },
--- linux-2.6.14/drivers/usb/input/wacom.c~	2005-12-27 18:26:44.000000000 -0500
+++ linux-2.6.14/drivers/usb/input/wacom.c	2005-12-27 18:27:17.000000000 -0500
@@ -672,6 +672,7 @@ static struct wacom_features wacom_featu
 	{ "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, INTUOS,     wacom_intuos_irq },
 	{ "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, INTUOS,     wacom_intuos_irq },
 	{ "Wacom Volito",        8,   5104,  3712,  511, 32, GRAPHIRE,   wacom_graphire_irq },
+	{ "Wacom Penpartner 04", 8,   3248,  2320,  511, 32, 1, wacom_graphire_irq },
 	{ "Wacom Cintiq Partner",8,  20480, 15360,  511, 32, PL,         wacom_ptu_irq },
 	{ "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 15, INTUOS3,    wacom_intuos_irq },
 	{ "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 15, INTUOS3,    wacom_intuos_irq },
@@ -705,6 +706,7 @@ static struct usb_device_id wacom_ids[] 
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x44) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x45) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
+	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB0) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB1) },


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1543
retrieving revision 1.1544
diff -u -r1.1543 -r1.1544
--- kernel-2.6.spec	16 Dec 2005 05:35:31 -0000	1.1543
+++ kernel-2.6.spec	27 Dec 2005 23:31:06 -0000	1.1544
@@ -344,6 +344,7 @@
 Patch1761: linux-2.6-suspend-mxcsr.patch
 Patch1771: linux-2.6-sata-promise-pata-ports.patch
 Patch1782: linux-2.6-selinux-mls-compat.patch
+Patch1783: linux-2.6-usbhid-wacom.patch
 
 
 # ACPI patches.
@@ -791,6 +792,8 @@
 %patch1771 -p1
 # SELinux MLS compat.
 %patch1782 -p1
+# usbhid incorrectly claimed wacom penpartner tablet.
+%patch1783 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1263,6 +1266,9 @@
 %endif
 
 %changelog
+* Tue Dec 27 2005 Dave Jones <davej at redhat.com>
+- usbhid incorrectly claimed wacom penpartner tablet. (#161241)
+
 * Fri Dec 16 2005 Dave Jones <davej at redhat.com>
 - Rebase to final 2.6.14.4
 


