Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index fe40e5e499dd4122ce0f623d9df776c0a0cf2bdf..d575e1852d8c6666cc5e10e77019f7f9811df46b 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -275,10 +275,12 @@ config HID_EMS_FF
         - Trio Linker Plus II
 
 config HID_ELECOM
-       tristate "ELECOM BM084 bluetooth mouse"
+       tristate "ELECOM HID devices"
        depends on HID
        ---help---
-       Support for the ELECOM BM084 (bluetooth mouse).
+       Support for ELECOM devices:
+         - BM084 Bluetooth Mouse
+         - DEFT Trackball (Wired and wireless)
 
 config HID_ELO
        tristate "ELO USB 4000/4500 touchscreen"
@@ -386,6 +388,13 @@ config HID_ICADE
        To compile this driver as a module, choose M here: the
        module will be called hid-icade.
 
+config HID_ITE
+       tristate "ITE devices"
+       depends on HID
+       default !EXPERT
+       ---help---
+       Support for ITE devices not fully compliant with HID standard.
+
 config HID_TWINHAN
        tristate "Twinhan IR remote control"
        depends on HID