diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /drivers/hid/hid-pl.c | |
| parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
| parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'drivers/hid/hid-pl.c')
| -rw-r--r-- | drivers/hid/hid-pl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index acd815586182..46941f979b9d 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c | |||
| @@ -178,6 +178,8 @@ err: | |||
| 178 | static const struct hid_device_id pl_devices[] = { | 178 | static const struct hid_device_id pl_devices[] = { |
| 179 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR), | 179 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR), |
| 180 | .driver_data = 1 }, /* Twin USB Joystick */ | 180 | .driver_data = 1 }, /* Twin USB Joystick */ |
| 181 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR), | ||
| 182 | .driver_data = 1 }, /* Twin USB Joystick */ | ||
| 181 | { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */ | 183 | { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */ |
| 182 | { } | 184 | { } |
| 183 | }; | 185 | }; |