diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/hid/hid-tmff.c | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
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[] = { | |||
| 249 | .driver_data = (unsigned long)ff_joystick }, | 249 | .driver_data = (unsigned long)ff_joystick }, |
| 250 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654), /* FGT Force Feedback Wheel */ | 250 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654), /* FGT Force Feedback Wheel */ |
| 251 | .driver_data = (unsigned long)ff_joystick }, | 251 | .driver_data = (unsigned long)ff_joystick }, |
| 252 | { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a), /* F430 Force Feedback Wheel */ | ||
| 253 | .driver_data = (unsigned long)ff_joystick }, | ||
| 252 | { } | 254 | { } |
| 253 | }; | 255 | }; |
| 254 | MODULE_DEVICE_TABLE(hid, tm_devices); | 256 | MODULE_DEVICE_TABLE(hid, tm_devices); |