summaryrefslogtreecommitdiff
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-07-24 15:40:06 +0400
committerJiri Kosina <jkosina@suse.cz>2012-07-24 15:40:06 +0400
commitc062c4d1de57789bf15f7641a24c429eeb8a1c6a (patch)
treedfd376034ea8458689c937dafa5e318892af82af /drivers/hid/Makefile
parent929bd380b7aec9f9553b6509af86cdba25e334b8 (diff)
parentadefb69b1b94df29ea2df05cd838c0e032b2c473 (diff)
downloadlinux-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.xz
Merge branch 'uhid' into for-linus
Conflicts: drivers/hid/Kconfig
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 02fa93896951..f975485f88b2 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -8,6 +8,7 @@ ifdef CONFIG_DEBUG_FS
endif
obj-$(CONFIG_HID) += hid.o
+obj-$(CONFIG_UHID) += uhid.o
obj-$(CONFIG_HID_GENERIC) += hid-generic.o