Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17...

[cascardo/linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 800c8b6..e02cf59 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -331,18 +331,20 @@ config HID_LCPOWER
        ---help---
        Support for LC-Power RC1000MCE RF remote control.
 
-config HID_LENOVO_TPKBD
-       tristate "Lenovo ThinkPad USB Keyboard with TrackPoint"
+config HID_LENOVO
+       tristate "Lenovo / Thinkpad devices"
        depends on HID
        select NEW_LEDS
        select LEDS_CLASS
        ---help---
-       Support for the Lenovo ThinkPad USB Keyboard with TrackPoint.
+       Support for Lenovo devices that are not fully compliant with HID standard.
 
-       Say Y here if you have a Lenovo ThinkPad USB Keyboard with TrackPoint
-       and would like to use device-specific features like changing the
-       sensitivity of the trackpoint, using the microphone mute button or
-       controlling the mute and microphone mute LEDs.
+       Say Y if you want support for the non-compliant features of the Lenovo
+       Thinkpad standalone keyboards, e.g:
+       - ThinkPad USB Keyboard with TrackPoint (supports extra LEDs and trackpoint
+         configuration)
+       - ThinkPad Compact Bluetooth Keyboard with TrackPoint (supports Fn keys)
+       - ThinkPad Compact USB Keyboard with TrackPoint (supports Fn keys)
 
 config HID_LOGITECH
        tristate "Logitech devices" if EXPERT
@@ -785,7 +787,7 @@ config HID_XINMO
        depends on HID
        ---help---
        Support for Xin-Mo devices that are not fully compliant with the HID
-       standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
+       standard. Currently only supports the Xin-Mo Dual Arcade. Say Y here
        if you have a Xin-Mo Dual Arcade controller.
 
 config HID_ZEROPLUS
@@ -810,7 +812,7 @@ config HID_ZYDACRON
 
 config HID_SENSOR_HUB
        tristate "HID Sensors framework support"
-       depends on HID
+       depends on HID && HAS_IOMEM
        select MFD_CORE
        default n
        ---help---