diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /drivers/hid/hid-topseed.c | |
| parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
| parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/hid/hid-topseed.c')
| -rw-r--r-- | drivers/hid/hid-topseed.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-topseed.c b/drivers/hid/hid-topseed.c index 5771f851f856..956ed9ac19d4 100644 --- a/drivers/hid/hid-topseed.c +++ b/drivers/hid/hid-topseed.c | |||
| @@ -64,6 +64,7 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi, | |||
| 64 | static const struct hid_device_id ts_devices[] = { | 64 | static const struct hid_device_id ts_devices[] = { |
| 65 | { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) }, | 65 | { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) }, |
| 66 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, | 66 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, |
| 67 | { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, | ||
| 67 | { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) }, | 68 | { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) }, |
| 68 | { } | 69 | { } |
| 69 | }; | 70 | }; |