diff options
| author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2012-02-13 14:13:03 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-21 16:00:31 +0100 |
| commit | 0944e964b23baee17d40abbd314695289380c2fd (patch) | |
| tree | a52d99f8e2e9b6c8ed442e14c9ebb26c13980b09 /drivers/hid | |
| parent | 42fc04e5f8190a6cae7aa5bf5b64fb5bc32a034f (diff) | |
| download | linux-0944e964b23baee17d40abbd314695289380c2fd.tar.gz linux-0944e964b23baee17d40abbd314695289380c2fd.tar.bz2 linux-0944e964b23baee17d40abbd314695289380c2fd.zip | |
HID: use generic driver for Logitech Unifying receivers if !CONFIG_HID_LOGITECH_DJ
Before commit 534a7b8e1 ("HID: Add full support for Logitech Unifying
receivers") Logitech Unifying receiver can work as generic device
without special driver, after that commit these devices does not works
without special driver.
After this patch they will use generic driver if special driver is disabled.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -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 0a55866f1f74..1e6b78ed5ac9 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 e89e4c7360c6..549c7538e57f 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) }, |