diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 10:14:55 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 10:14:55 +0200 |
| commit | db8c076b9206ea35b1f7299708d5510b17674db2 (patch) | |
| tree | 7a5ee32db0c25bb29598c7c300ce7f2680f533a9 /drivers/hid/hid-topseed.c | |
| parent | drm/i915: Hold a reference to the object whilst unbinding the eviction list (diff) | |
| parent | Linux 2.6.36-rc5 (diff) | |
| download | linux-db8c076b9206ea35b1f7299708d5510b17674db2.tar.xz linux-db8c076b9206ea35b1f7299708d5510b17674db2.zip | |
Merge remote branch 'linus' into drm-intel-fixes
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, static const struct hid_device_id ts_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) }, { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) }, + { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) }, { } }; |