diff options
| author | Jiri Kosina | 2010-12-10 15:19:18 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2010-12-10 15:19:18 +0100 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/hid/hid-tmff.c | |
| parent | HID: simplify an index check in hid_lookup_collection (diff) | |
| parent | Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes... (diff) | |
| download | kernel-qcow2-linux-2ade0c1d9d93b7642212657ef76f4a1e30233711.tar.gz kernel-qcow2-linux-2ade0c1d9d93b7642212657ef76f4a1e30233711.tar.xz kernel-qcow2-linux-2ade0c1d9d93b7642212657ef76f4a1e30233711.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/hid/hid-tmff.c')
| -rw-r--r-- | drivers/hid/hid-tmff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index 356a98fcb365..575862b0688e 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c @@ -249,6 +249,8 @@ static const struct hid_device_id tm_devices[] = { .driver_data = (unsigned long)ff_joystick }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654), /* FGT Force Feedback Wheel */ .driver_data = (unsigned long)ff_joystick }, + { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a), /* F430 Force Feedback Wheel */ + .driver_data = (unsigned long)ff_joystick }, { } }; MODULE_DEVICE_TABLE(hid, tm_devices); |