| commit | 367ff459e54d1bc471880aef21239d2a0a03b12e | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Oct 17 14:07:56 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Oct 17 14:07:56 2012 -0700 |
| tree | 90a11db77aa8fdec075c0cf185c02bb4f423b45e | |
| parent | 3e5bde8ef4cc9e719b492726dd82a43d29468cd0 [diff] | |
| parent | 5217c129443600b414e5b64aafe358952b78a65d [diff] |
Merge tag 'disintegrate-tty-20121009' of git://git.infradead.org/users/dhowells/linux-headers into tty-linus UAPI Disintegration 2012-10-09
diff --git a/include/linux/hsi/Kbuild b/include/linux/hsi/Kbuild index 271a770..e69de29 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 aafaa5a..30ab3cd 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 similarity index 100% rename from include/linux/hsi/hsi_char.h rename to include/uapi/linux/hsi/hsi_char.h