diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-12-18 15:09:38 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-12-18 15:09:38 +0530 |
| commit | 4d4899cc6c5f3572bdca0486a123f42d19261603 (patch) | |
| tree | d4b9187ce1830eba4d5782168af1989b84943777 /drivers/hid/Kconfig | |
| parent | 8466c55d9fbc79c97cfe36a376f10d4805868399 (diff) | |
| parent | 4231b6a98fceb1589f13e886c26130d2fd4e3901 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.106-hikey
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 513a16cc6e18..2729ab3557bb 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -165,11 +165,11 @@ config HID_CHERRY Support for Cherry Cymotion keyboard. config HID_CHICONY - tristate "Chicony Tactical pad" + tristate "Chicony devices" depends on HID default !EXPERT ---help--- - Support for Chicony Tactical pad. + Support for Chicony Tactical pad and special keys on Chicony keyboards. config HID_CORSAIR tristate "Corsair devices" |