summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-07-28 10:49:23 +0200
committerJiri Kosina <jkosina@suse.cz>2016-07-28 10:49:23 +0200
commit8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch)
treec4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /drivers/hid/Makefile
parente82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff)
parentf4c109b660fa1d0453a6dde75bef725304687832 (diff)
downloadlinux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.gz
linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.bz2
linux-8c2f421c1f0fa7768767ecaad497aa676fc9015a.zip
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts: drivers/hid/hid-thingm.c
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index a55ec2988d38..fc4b2aa47f2e 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -91,12 +91,12 @@ obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.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_THINGM) += hid-thingm.o
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
obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.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