diff options
-rw-r--r-- | drivers/hid/Kconfig | 5 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-saitek.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 6ab51ae3c39d..434ffa566340 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -672,9 +672,8 @@ config HID_SAITEK | |||
672 | 672 | ||
673 | Supported devices: | 673 | Supported devices: |
674 | - PS1000 Dual Analog Pad | 674 | - PS1000 Dual Analog Pad |
675 | - R.A.T.9 Gaming Mouse | 675 | - Saitek R.A.T.7, R.A.T.9, M.M.O.7 Gaming Mice |
676 | - R.A.T.7 Gaming Mouse | 676 | - Mad Catz R.A.T.5, R.A.T.9 Gaming Mice |
677 | - M.M.O.7 Gaming Mouse | ||
678 | 677 | ||
679 | config HID_SAMSUNG | 678 | config HID_SAMSUNG |
680 | tristate "Samsung InfraRed remote control or keyboards" | 679 | tristate "Samsung InfraRed remote control or keyboards" |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index bcd914a63af2..31fc6427cac3 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1981,6 +1981,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1981 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD) }, | 1981 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD) }, |
1982 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7) }, | 1982 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7) }, |
1983 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) }, | 1983 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) }, |
1984 | { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT5) }, | ||
1984 | { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) }, | 1985 | { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) }, |
1985 | #endif | 1986 | #endif |
1986 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, | 1987 | { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index f769208276ae..99c13cd2bf07 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -646,6 +646,7 @@ | |||
646 | 646 | ||
647 | #define USB_VENDOR_ID_MADCATZ 0x0738 | 647 | #define USB_VENDOR_ID_MADCATZ 0x0738 |
648 | #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 | 648 | #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 |
649 | #define USB_DEVICE_ID_MADCATZ_RAT5 0x1705 | ||
649 | #define USB_DEVICE_ID_MADCATZ_RAT9 0x1709 | 650 | #define USB_DEVICE_ID_MADCATZ_RAT9 0x1709 |
650 | 651 | ||
651 | #define USB_VENDOR_ID_MCC 0x09db | 652 | #define USB_VENDOR_ID_MCC 0x09db |
diff --git a/drivers/hid/hid-saitek.c b/drivers/hid/hid-saitek.c index a014f21275d8..2f84b26f1167 100644 --- a/drivers/hid/hid-saitek.c +++ b/drivers/hid/hid-saitek.c | |||
@@ -177,6 +177,8 @@ static int saitek_event(struct hid_device *hdev, struct hid_field *field, | |||
177 | static const struct hid_device_id saitek_devices[] = { | 177 | static const struct hid_device_id saitek_devices[] = { |
178 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000), | 178 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000), |
179 | .driver_data = SAITEK_FIX_PS1000 }, | 179 | .driver_data = SAITEK_FIX_PS1000 }, |
180 | { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT5), | ||
181 | .driver_data = SAITEK_RELEASE_MODE_RAT7 }, | ||
180 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD), | 182 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD), |
181 | .driver_data = SAITEK_RELEASE_MODE_RAT7 }, | 183 | .driver_data = SAITEK_RELEASE_MODE_RAT7 }, |
182 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7), | 184 | { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7), |