Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16...

[platform/kernel/linux-rpi.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 7af9d0b..800c8b6 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -608,7 +608,10 @@ config HID_SAITEK
        Support for Saitek devices that are not fully compliant with the
        HID standard.
 
-       Currently only supports the PS1000 controller.
+       Supported devices:
+       - PS1000 Dual Analog Pad
+       - R.A.T.7 Gaming Mouse
+       - M.M.O.7 Gaming Mouse
 
 config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"
@@ -657,6 +660,14 @@ config HID_SUNPLUS
        ---help---
        Support for Sunplus wireless desktop.
 
+config HID_RMI
+       tristate "Synaptics RMI4 device support"
+       depends on HID
+       ---help---
+       Support for Synaptics RMI4 touchpads.
+       Say Y here if you have a Synaptics RMI4 touchpads over i2c-hid or usbhid
+       and want support for its special functionalities.
+
 config HID_GREENASIA
        tristate "GreenAsia (Product ID 0x12) game controller support"
        depends on HID