summaryrefslogtreecommitdiff
path: root/include/uapi/linux/hsi/Kbuild
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-11-13 21:36:07 +0400
committerCatalin Marinas <catalin.marinas@arm.com>2012-11-13 21:36:07 +0400
commit6097a07411005c0184cf90256743c784079198fc (patch)
tree0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a /include/uapi/linux/hsi/Kbuild
parent6a872777ffff6184f4ac10bd71d926d5e6f2491e (diff)
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
downloadlinux-6097a07411005c0184cf90256743c784079198fc.tar.xz
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5 Conflicts: arch/arm64/kernel/process.c
Diffstat (limited to 'include/uapi/linux/hsi/Kbuild')
-rw-r--r--include/uapi/linux/hsi/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/hsi/Kbuild b/include/uapi/linux/hsi/Kbuild
index aafaa5aa54d4..30ab3cd3b8a5 100644
--- a/include/uapi/linux/hsi/Kbuild
+++ b/include/uapi/linux/hsi/Kbuild
@@ -1 +1,2 @@
# UAPI Header export list
+header-y += hsi_char.h