diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/hid/hid-cypress.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/hid/hid-cypress.c')
| -rw-r--r-- | drivers/hid/hid-cypress.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c index 62e9cb10e88c..998b6f443d7d 100644 --- a/drivers/hid/hid-cypress.c +++ b/drivers/hid/hid-cypress.c | |||
| @@ -126,6 +126,8 @@ static const struct hid_device_id cp_devices[] = { | |||
| 126 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, | 126 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, |
| 127 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2), | 127 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2), |
| 128 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, | 128 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, |
| 129 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3), | ||
| 130 | .driver_data = CP_RDESC_SWAPPED_MIN_MAX }, | ||
| 129 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE), | 131 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE), |
| 130 | .driver_data = CP_2WHEEL_MOUSE_HACK }, | 132 | .driver_data = CP_2WHEEL_MOUSE_HACK }, |
| 131 | { } | 133 | { } |