diff options
| author | Jiri Kosina | 2012-07-24 13:40:06 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2012-07-24 13:40:06 +0200 |
| commit | c062c4d1de57789bf15f7641a24c429eeb8a1c6a (patch) | |
| tree | dfd376034ea8458689c937dafa5e318892af82af /include/linux/Kbuild | |
| parent | Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes... (diff) | |
| parent | HID: uhid: Fix sending events with invalid data (diff) | |
| download | kernel-qcow2-linux-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.gz kernel-qcow2-linux-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.xz kernel-qcow2-linux-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.zip | |
Merge branch 'uhid' into for-linus
Conflicts:
drivers/hid/Kconfig
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 8760be30b375..cb2a7d1ad47b 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 |