summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-18 01:07:56 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-18 01:07:56 +0400
commit367ff459e54d1bc471880aef21239d2a0a03b12e (patch)
tree90a11db77aa8fdec075c0cf185c02bb4f423b45e /include
parent3e5bde8ef4cc9e719b492726dd82a43d29468cd0 (diff)
parent5217c129443600b414e5b64aafe358952b78a65d (diff)
downloadlinux-367ff459e54d1bc471880aef21239d2a0a03b12e.tar.xz
Merge tag 'disintegrate-tty-20121009' of git://git.infradead.org/users/dhowells/linux-headers into tty-linus
UAPI Disintegration 2012-10-09
Diffstat (limited to 'include')
-rw-r--r--include/linux/hsi/Kbuild1
-rw-r--r--include/uapi/linux/hsi/Kbuild1
-rw-r--r--include/uapi/linux/hsi/hsi_char.h (renamed from include/linux/hsi/hsi_char.h)0
3 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hsi/Kbuild b/include/linux/hsi/Kbuild
index 271a770b4784..e69de29bb2d1 100644
--- a/include/linux/hsi/Kbuild
+++ b/include/linux/hsi/Kbuild
@@ -1 +0,0 @@
-header-y += hsi_char.h
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
diff --git a/include/linux/hsi/hsi_char.h b/include/uapi/linux/hsi/hsi_char.h
index 76160b4f455d..76160b4f455d 100644
--- a/include/linux/hsi/hsi_char.h
+++ b/include/uapi/linux/hsi/hsi_char.h