diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 12:58:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 12:58:38 -0500 |
| commit | 8f685fbda43deccd130d192c9fcef1444649eaca (patch) | |
| tree | 976ed00423d03bdcaf11569a0c5c72ecb1c5c6c8 /drivers/hid/hid-mosart.c | |
| parent | d24450e2075b9ceeef8ad942e6391bc73eae6933 (diff) | |
| parent | 2d93666e70662cfcf1927e1a858685f5b38d5d65 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hid-multitouch: minor fixes based on additional review
HID: Switch turbox/mosart touchscreen to hid-mosart
HID: add Add Cando touch screen 10.1-inch product id
HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger'
HID: hid-multitouch: add support for Cypress TrueTouch panels
HID: hid-multitouch: support for PixCir-based panels
HID: set HID_MAX_FIELD at 128
HID: add feature_mapping callback
Diffstat (limited to 'drivers/hid/hid-mosart.c')
| -rw-r--r-- | drivers/hid/hid-mosart.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-mosart.c b/drivers/hid/hid-mosart.c index 9fb050ce6f04..aed7ffe36283 100644 --- a/drivers/hid/hid-mosart.c +++ b/drivers/hid/hid-mosart.c | |||
| @@ -257,6 +257,7 @@ static void mosart_remove(struct hid_device *hdev) | |||
| 257 | static const struct hid_device_id mosart_devices[] = { | 257 | static const struct hid_device_id mosart_devices[] = { |
| 258 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, | 258 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, |
| 259 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) }, | 259 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) }, |
| 260 | { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) }, | ||
| 260 | { } | 261 | { } |
| 261 | }; | 262 | }; |
| 262 | MODULE_DEVICE_TABLE(hid, mosart_devices); | 263 | MODULE_DEVICE_TABLE(hid, mosart_devices); |