diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/Kconfig | 4 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 0a55866..1e6b78e 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -257,7 +257,9 @@ config HID_LOGITECH_DJ ---help--- Say Y if you want support for Logitech Unifying receivers and devices. Unifying receivers are capable of pairing up to 6 Logitech compliant - devices to the same receiver. + devices to the same receiver. Without this driver it will be handled by + generic USB_HID driver and all incomming events will be multiplexed + into a single mouse and a single keyboard device. config LOGITECH_FF bool "Logitech force feedback support" diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index e89e4c7..549c753 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1463,8 +1463,10 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G27_WHEEL) }, +#if IS_ENABLED(CONFIG_HID_LOGITECH_DJ) { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2) }, +#endif { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) }, |