diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /drivers/hid/hid-dell.c | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'drivers/hid/hid-dell.c')
| -rw-r--r-- | drivers/hid/hid-dell.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c index 1a0d0dfc62fc..f5474300b83a 100644 --- a/drivers/hid/hid-dell.c +++ b/drivers/hid/hid-dell.c | |||
| @@ -48,6 +48,7 @@ err_free: | |||
| 48 | static const struct hid_device_id dell_devices[] = { | 48 | static const struct hid_device_id dell_devices[] = { |
| 49 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) }, | 49 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) }, |
| 50 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, | 50 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, |
| 51 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) }, | ||
| 51 | { } | 52 | { } |
| 52 | }; | 53 | }; |
| 53 | MODULE_DEVICE_TABLE(hid, dell_devices); | 54 | MODULE_DEVICE_TABLE(hid, dell_devices); |