summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2021-04-29 21:46:05 +0200
committerJiri Kosina <jkosina@suse.cz>2021-04-29 21:46:05 +0200
commit5a4a13cb47121dd20812e3397d30fd410ebd9f7d (patch)
treea3f03eb877086c4f3245983489b467c6d47a8a3c /drivers/hid/Makefile
parentMerge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus (diff)
parentHID: hid-thrustmaster: Demote a bunch of kernel-doc abuses (diff)
downloadlinux-5a4a13cb47121dd20812e3397d30fd410ebd9f7d.tar.xz
linux-5a4a13cb47121dd20812e3397d30fd410ebd9f7d.zip
Merge branch 'for-5.13/thrustmaster' into for-linus
- support for initialization of some newer Thrustmaster wheels from Dario Pagani
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index a664a495fc44..193431ec4db8 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -113,7 +113,8 @@ obj-$(CONFIG_HID_STEAM) += hid-steam.o
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
-obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
+obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o hid-thrustmaster.o
+obj-$(CONFIG_HID_TMINIT) += hid-tminit.o
obj-$(CONFIG_HID_TIVO) += hid-tivo.o
obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o