Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / hid / hid-dell.c

diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
index 98ee40e8751fdf99a475cdd767a373c4e5e69a73..f5474300b83a23708bdeebfb60b959d729221627 100644 (file)
--- a/drivers/hid/hid-dell.c
+++ b/drivers/hid/hid-dell.c
@@ -47,6 +47,8 @@ err_free:
 
 static const struct hid_device_id dell_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, dell_devices);