From a83638ec15906a48123c17e5c54fb0abb0c939c4 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Mon, 13 Feb 2012 14:13:03 +0400 Subject: [PATCH] --- yaml --- r: 291663 b: refs/heads/master c: 0944e964b23baee17d40abbd314695289380c2fd h: refs/heads/master i: 291661: 7a0f621b7ce1266447c091994feba31df8ff1696 291659: 347fef0615feec25f205e62c9cf7ab3174850d12 291655: 151d4338118a78214229b7896cbf27e327d658f8 291647: 5b6ef36364c73d1a3d140425554bc3290e03518d v: v3 --- [refs] | 2 +- trunk/drivers/hid/Kconfig | 4 +++- trunk/drivers/hid/hid-core.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3f71f9b2520d..8938675d6ddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42fc04e5f8190a6cae7aa5bf5b64fb5bc32a034f +refs/heads/master: 0944e964b23baee17d40abbd314695289380c2fd diff --git a/trunk/drivers/hid/Kconfig b/trunk/drivers/hid/Kconfig index 0a55866f1f74..1e6b78ed5ac9 100644 --- a/trunk/drivers/hid/Kconfig +++ b/trunk/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/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index e89e4c7360c6..549c7538e57f 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/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) },