diff -rcNP linux-2.6.32.3.vanilla/drivers/hid/Kconfig linux-2.6.32.3/drivers/hid/Kconfig
*** linux-2.6.32.3.vanilla/drivers/hid/Kconfig	Mon Jan 11 20:09:17 2010
--- linux-2.6.32.3/drivers/hid/Kconfig	Mon Jan 11 21:16:24 2010
***************
*** 204,209 ****
--- 204,216 ----
  	---help---
  	Support for N-Trig touch screen.
  
+ config HID_ORTEK
+ 	tristate "Ortek" if EMBEDDED
+ 	depends on USB_HID
+ 	default !EMBEDDED
+ 	---help---
+ 	Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.
+ 
  config HID_PANTHERLORD
  	tristate "Pantherlord support" if EMBEDDED
  	depends on USB_HID
diff -rcNP linux-2.6.32.3.vanilla/drivers/hid/Makefile linux-2.6.32.3/drivers/hid/Makefile
*** linux-2.6.32.3.vanilla/drivers/hid/Makefile	Mon Jan 11 20:09:17 2010
--- linux-2.6.32.3/drivers/hid/Makefile	Mon Jan 11 21:14:29 2010
***************
*** 34,39 ****
--- 34,40 ----
  obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o
  obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o
  obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o
+ obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o
  obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o
  obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o
  obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o
diff -rcNP linux-2.6.32.3.vanilla/drivers/hid/hid-core.c linux-2.6.32.3/drivers/hid/hid-core.c
*** linux-2.6.32.3.vanilla/drivers/hid/hid-core.c	Mon Jan 11 20:09:17 2010
--- linux-2.6.32.3/drivers/hid/hid-core.c	Mon Jan 11 21:56:44 2010
***************
*** 1333,1338 ****
--- 1333,1339 ----
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
diff -rcNP linux-2.6.32.3.vanilla/drivers/hid/hid-ids.h linux-2.6.32.3/drivers/hid/hid-ids.h
*** linux-2.6.32.3.vanilla/drivers/hid/hid-ids.h	Mon Jan 11 20:09:17 2010
--- linux-2.6.32.3/drivers/hid/hid-ids.h	Mon Jan 11 20:20:01 2010
***************
*** 352,357 ****
--- 352,360 ----
  #define USB_VENDOR_ID_ONTRAK		0x0a07
  #define USB_DEVICE_ID_ONTRAK_ADU100	0x0064
  
+ #define USB_VENDOR_ID_ORTEK		0x05a4
+ #define USB_DEVICE_ID_ORTEK_WKB2000	0x2000
+ 
  #define USB_VENDOR_ID_PANJIT		0x134c
  
  #define USB_VENDOR_ID_PANTHERLORD	0x0810
diff -rcNP linux-2.6.32.3.vanilla/drivers/hid/hid-ortek.c linux-2.6.32.3/drivers/hid/hid-ortek.c
*** linux-2.6.32.3.vanilla/drivers/hid/hid-ortek.c	Thu Jan  1 01:00:00 1970
--- linux-2.6.32.3/drivers/hid/hid-ortek.c	Mon Jan 11 21:47:00 2010
***************
*** 0 ****
--- 1,56 ----
+ /*
+  *  HID driver for Ortek WKB-2000 (wireless keyboard + mouse trackpad).
+  *  Fixes errors in USB report description, see
+  *  http://bugzilla.kernel.org/show_bug.cgi?id=14787
+  *
+  *  Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com>
+  */
+ 
+ /*
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the Free
+  * Software Foundation; either version 2 of the License, or (at your option)
+  * any later version.
+  */
+ 
+ #include <linux/device.h>
+ #include <linux/hid.h>
+ #include <linux/module.h>
+ 
+ #include "hid-ids.h"
+ 
+ static void ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+ 		unsigned int rsize)
+ {
+ 	if (rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) {
+ 		dev_info(&hdev->dev, "Fixing up Ortek WKB-2000 "
+ 				"report descriptor.\n");
+ 		rdesc[55] = 0x92;
+ 	}
+ }
+ 
+ static const struct hid_device_id ortek_devices[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(hid, ortek_devices);
+ 
+ static struct hid_driver ortek_driver = {
+ 	.name = "ortek",
+ 	.id_table = ortek_devices,
+ 	.report_fixup = ortek_report_fixup
+ };
+ 
+ static int __init ortek_init(void)
+ {
+ 	return hid_register_driver(&ortek_driver);
+ }
+ 
+ static void __exit ortek_exit(void)
+ {
+ 	hid_unregister_driver(&ortek_driver);
+ }
+ 
+ module_init(ortek_init);
+ module_exit(ortek_exit);
+ MODULE_LICENSE("GPL");