diff options
| author | Jiri Kosina | 2018-04-05 13:17:23 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2018-04-05 13:17:23 +0200 |
| commit | 7a8c1c4e71e4c694e2c9a05f565dd5dac43faa40 (patch) | |
| tree | 522cd3622948f0eb1bbd38e76870ef0dec3836b6 /drivers/hid/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 4e9b57a44e96..17a8bd97da9d 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_HID_CP2112) += hid-cp2112.o obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o obj-$(CONFIG_HID_DRAGONRISE) += hid-dr.o obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o +obj-$(CONFIG_HID_ELAN) += hid-elan.o obj-$(CONFIG_HID_ELECOM) += hid-elecom.o obj-$(CONFIG_HID_ELO) += hid-elo.o obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o |