summaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-07-24 13:40:06 +0200
committerJiri Kosina <jkosina@suse.cz>2012-07-24 13:40:06 +0200
commitc062c4d1de57789bf15f7641a24c429eeb8a1c6a (patch)
treedfd376034ea8458689c937dafa5e318892af82af /include/linux/Kbuild
parent929bd380b7aec9f9553b6509af86cdba25e334b8 (diff)
parentadefb69b1b94df29ea2df05cd838c0e032b2c473 (diff)
downloadop-kernel-dev-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.zip
op-kernel-dev-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.gz
Merge branch 'uhid' into for-linus
Conflicts: drivers/hid/Kconfig
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 8760be3..cb2a7d1 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -376,6 +376,7 @@ header-y += tty.h
header-y += types.h
header-y += udf_fs_i.h
header-y += udp.h
+header-y += uhid.h
header-y += uinput.h
header-y += uio.h
header-y += ultrasound.h
OpenPOWER on IntegriCloud