diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-12-01 17:45:22 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-12-01 17:45:22 +0100 |
| commit | d29736819f4fb064547955a761df4cf270ac4f20 (patch) | |
| tree | 6b4cd069ef8888c6174f68f7742306adbf5a8f4d /drivers | |
| parent | 67ade14929eaba640c9f27e04a70baa0ca30bed9 (diff) | |
| parent | 31596adc849007adb74d4476a73b2f262e7d0fbd (diff) | |
Merge branch 'reintroduce-unibody' into for-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 0bec34771598..34cc3b0d01f6 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1653,6 +1653,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { } |