summaryrefslogtreecommitdiff
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-03-05 17:30:16 +0300
committerJiri Kosina <jkosina@suse.cz>2019-03-05 17:30:16 +0300
commit487b6d0c876e83ecd833f8abbf98181f1bb058ae (patch)
tree56359977a38b0d032be45f127cbbb3e677a1c9ae /drivers/hid/Makefile
parent7ff6dae4abff4ad56c76aef197317e53dc5d6893 (diff)
parent24b2f66628ac7e0de06666501f682d77c6c0485d (diff)
downloadlinux-487b6d0c876e83ecd833f8abbf98181f1bb058ae.tar.xz
Merge branch 'for-5.1/hid-uclogic' into for-linus
hid-uclogic driver revamp, in order to support wider range of Huion tablets, from Nikolai Kondrashov
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index cf2752003253..170163b41303 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -109,12 +109,16 @@ obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
obj-$(CONFIG_HID_TIVO) += hid-tivo.o
obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o
+hid-uclogic-objs := hid-uclogic-core.o \
+ hid-uclogic-rdesc.o \
+ hid-uclogic-params.o
obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o
obj-$(CONFIG_HID_UDRAW_PS3) += hid-udraw-ps3.o
obj-$(CONFIG_HID_LED) += hid-led.o
obj-$(CONFIG_HID_XINMO) += hid-xinmo.o
obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o
obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
+obj-$(CONFIG_HID_VIEWSONIC) += hid-viewsonic.o
wacom-objs := wacom_wac.o wacom_sys.o
obj-$(CONFIG_HID_WACOM) += wacom.o