diff --git a/[refs] b/[refs] index 4ab83b8e11c9..6ee57826e90a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e93674a8ea169320950c5e6d1fa29a20b534e60 +refs/heads/master: c7fd7937ba81d1e46b4c4cc3dd06010834b08b98 diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h index bc6e2b5862aa..30d1f7ba2723 100644 --- a/trunk/drivers/hid/hid-ids.h +++ b/trunk/drivers/hid/hid-ids.h @@ -615,7 +615,7 @@ #define USB_VENDOR_ID_SAITEK 0x06a3 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17 -#define USB_DEVICE_ID_SAITEK_PS1000 0xff17 +#define USB_DEVICE_ID_SAITEK_PS1000 0x0621 #define USB_VENDOR_ID_SAMSUNG 0x0419 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001