rpms/kernel/devel linux-2.6-input-hid-quirk-egalax.patch, 1.1, 1.2 kernel.spec, 1.1984, 1.1985

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10285

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-input-hid-quirk-egalax.patch 
Log Message:
* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
- linux-2.6-input-hid-quirk-egalax.patch: copy from F-13^H2.


linux-2.6-input-hid-quirk-egalax.patch:
 hid-ids.h           |    3 +++
 usbhid/hid-quirks.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

Index: linux-2.6-input-hid-quirk-egalax.patch
===================================================================
RCS file: linux-2.6-input-hid-quirk-egalax.patch
diff -N linux-2.6-input-hid-quirk-egalax.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-input-hid-quirk-egalax.patch	10 May 2010 14:37:16 -0000	1.2
@@ -0,0 +1,41 @@
+Date: Mon, 1 Feb 2010 12:53:47 +1300
+From: Peter Hutterer <peter.hutterer at redhat.com>
+To: Dave Airlie <airlied at redhat.com>
+Subject: [PATCH] HID: add multi-input quirk for eGalax Touchcontroller
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Tested-by: Alfred Broda <guaranga at wp.pl>
+---
+ drivers/hid/hid-ids.h           |    3 +++
+ drivers/hid/usbhid/hid-quirks.c |    1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index f5144b8..2e698a2 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -158,6 +158,9 @@
+ 
+ #define USB_VENDOR_ID_DRAGONRISE	0x0079
+ 
++#define USB_VENDOR_ID_EGALAX		0x0EEF
++#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001
++
+ #define USB_VENDOR_ID_ELO		0x04E7
+ #define USB_DEVICE_ID_ELO_TS2700	0x0020
+ 
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index e987562..dc27d74 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -32,6 +32,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
+ 	{ USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
+ 	{ USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
++	{ USB_VENDOR_ID_EGALAX, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
+ 	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
+-- 
+1.6.5.2
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -p -r1.1984 -r1.1985
--- kernel.spec	10 May 2010 14:29:57 -0000	1.1984
+++ kernel.spec	10 May 2010 14:37:15 -0000	1.1985
@@ -742,6 +742,7 @@ Patch2905: linux-2.6-v4l-dvb-gspca-fixes
 # VIA Nano / VX8xx updates
 
 # patches headed upstream
+Patch12005: linux-2.6-input-hid-quirk-egalax.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
 
@@ -1318,6 +1319,8 @@ ApplyPatch hdpvr-ir-enable.patch
 #ApplyPatch vhost_net-rollup.patch
 #ApplyPatch virt_console-rollup.patch
 
+ApplyPatch linux-2.6-input-hid-quirk-egalax.patch
+
 # Fix block I/O errors in KVM
 #ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 
@@ -2019,6 +2022,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
+- linux-2.6-input-hid-quirk-egalax.patch: copy from F-13^H2.
+
 * Mon May 10 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.49.rc7.git0
 - autofs: Patch from Ian Kent to fix non-top level mounts. (rhbz#583483)