Merge branches 'for-5.1/upstream-fixes', 'for-5.2/core', 'for-5.2/ish', 'for-5.2...

[mirror_ubuntu-kernels.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a0c678d28af0e6d1c4a3bd428c9c9e8d5f95a86a..c3c390ca369022f0de310c1ad99960ac2e53d6b3 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -231,6 +231,16 @@ config HID_COUGAR
        Supported devices:
        - Cougar 500k Gaming Keyboard
 
+config HID_MACALLY
+       tristate "Macally devices"
+       depends on HID
+       help
+       Support for Macally devices that are not fully compliant with the
+       HID standard.
+
+       supported devices:
+       - Macally ikey keyboard
+
 config HID_PRODIKEYS
        tristate "Prodikeys PC-MIDI Keyboard support"
        depends on HID && SND
@@ -511,6 +521,7 @@ config HID_LOGITECH
 
 config HID_LOGITECH_DJ
        tristate "Logitech Unifying receivers full support"
+       depends on USB_HID
        depends on HIDRAW
        depends on HID_LOGITECH
        select HID_LOGITECH_HIDPP