summaryrefslogtreecommitdiff
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2022-10-05 12:34:48 +0300
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>2022-10-05 12:34:48 +0300
commit430257d8329b58170a92364597e474fa607e28b2 (patch)
treeceab2dadf0d27795eb7e1550a48330a50f69b85b /drivers/hid/Makefile
parentd7ae8ff97e6243c09ac4ab8d737504224bd3475c (diff)
parent7495fb7e74259234ae7054a2727ff4f39a8eb384 (diff)
downloadlinux-430257d8329b58170a92364597e474fa607e28b2.tar.xz
Merge branch 'for-6.1/uclogic' into for-linus
- Add UGEEv2 support (XP-PEN Deco Pro S and Parblo A610 PRO) (José Expósito)
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index c0615f13ba98..e8014c1a2f8b 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -147,8 +147,10 @@ obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o
obj-$(CONFIG_HID_SENSOR_HUB) += hid-sensor-hub.o
obj-$(CONFIG_HID_SENSOR_CUSTOM_SENSOR) += hid-sensor-custom.o
-obj-$(CONFIG_HID_KUNIT_TEST) += hid-uclogic-rdesc.o \
+hid-uclogic-test-objs := hid-uclogic-rdesc.o \
+ hid-uclogic-params.o \
hid-uclogic-rdesc-test.o
+obj-$(CONFIG_HID_KUNIT_TEST) += hid-uclogic-test.o
obj-$(CONFIG_USB_HID) += usbhid/
obj-$(CONFIG_USB_MOUSE) += usbhid/