summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-14 17:51:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-14 17:51:16 -0700
commit1bf4b1268e66d9364fc6fd41f906bc01458530ac (patch)
tree4e7b2106d437cf011a92b91c44eb356c55c7b0ff /include/uapi
parent7e703eccf02a4a6aac6574f5fd4680a0619fdbfb (diff)
parent5376366886251e2f8f248704adb620a4bc4c0937 (diff)
downloadlinux-1bf4b1268e66d9364fc6fd41f906bc01458530ac.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "Just a small update to xpad driver to recognize yet another gamepad, and another change making sure userio.h is exported" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: xpad - add support for Razer Wildcat gamepad uapi: add missing install of userio.h
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index dd9820b1c779..f8d9fed17ba9 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -445,6 +445,7 @@ header-y += unistd.h
header-y += unix_diag.h
header-y += usbdevice_fs.h
header-y += usbip.h
+header-y += userio.h
header-y += utime.h
header-y += utsname.h
header-y += uuid.h