Merge tag 'disintegrate-tty-20121009' of git://git.infradead.org/user…

…s/dhowells/linux-headers into tty-linus UAPI Disintegration 2012-10-09
git-mirror · Oct 17, 2012 · 367ff45 · 367ff45
2 parents 3e5bde8 + 5217c12
commit 367ff45
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git 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
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += hsi_char.h
diff --git a/include/linux/hsi/hsi_char.h → include/uapi/linux/hsi/hsi_char.h b/include/linux/hsi/hsi_char.h → include/uapi/linux/hsi/hsi_char.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		# UAPI Header export list
		header-y += hsi_char.h