summaryrefslogtreecommitdiff
path: root/include/uapi/linux/Kbuild
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-05 08:41:36 +0200
committerIngo Molnar <mingo@kernel.org>2016-05-05 08:41:36 +0200
commitf3391a160b22f8e006f3fb8ef39aa01da749fbf0 (patch)
tree9a8f61fe1a3dd0d12e7511567b2344f80f5aa531 /include/uapi/linux/Kbuild
parentd7847a7017b2a2759dd5590c0cffdbdf2994918e (diff)
parent04974df8049fc4240d22759a91e035082ccd18b4 (diff)
Merge tag 'v4.6-rc6' into x86/cpu, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/Kbuild')
-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 b71fd0b5cbad..813ffb2e22c9 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -96,6 +96,7 @@ header-y += cyclades.h
header-y += cycx_cfm.h
header-y += dcbnl.h
header-y += dccp.h
+header-y += devlink.h
header-y += dlmconstants.h
header-y += dlm_device.h
header-y += dlm.h