diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:17:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:17:23 +0200 |
| commit | 7a8c1c4e71e4c694e2c9a05f565dd5dac43faa40 (patch) | |
| tree | 522cd3622948f0eb1bbd38e76870ef0dec3836b6 /drivers/hid/Kconfig | |
| parent | d463fd44c4d620b6f96f9f56474fbd42cb663a84 (diff) | |
| parent | 9a6a4193d65b853020ef0e66cecdf9e64a863883 (diff) | |
Merge branch 'for-4.17/hid-elan' into for-linus
Pull new hid-elan driver, currently providing support for touchpad
found in certain HP Pavilion x2 laptops.
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 459adf77d968..60252fd796f6 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -274,6 +274,14 @@ config HID_EMS_FF Currently the following devices are known to be supported: - Trio Linker Plus II +config HID_ELAN + tristate "ELAN USB Touchpad Support" + depends on LEDS_CLASS && USB_HID + ---help--- + Say Y to enable support for the USB ELAN touchpad + Currently the following devices are known to be supported: + - HP Pavilion X2 10-p0XX. + config HID_ELECOM tristate "ELECOM HID devices" depends on HID |