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

…s/dhowells/linux-headers Pull spi UAPI disintegration from David Howells: "This is to complete part of the Userspace API (UAPI) disintegration for which the preparatory patches were pulled recently. After these patches, userspace headers will be segregated into: include/uapi/linux/.../foo.h for the userspace interface stuff, and: include/linux/.../foo.h for the strictly kernel internal stuff. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Grant Likely <grant.likely@secretlab.ca>" * tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate include/linux/spi
mariux64 · Oct 13, 2012 · 034b5ee · 034b5ee
2 parents 7c5a473 + 7939d3c
commit 034b5ee
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/include/linux/spi/Kbuild b/include/linux/spi/Kbuild
@@ -1 +0,0 @@
-header-y += spidev.h

diff --git a/include/uapi/linux/spi/Kbuild b/include/uapi/linux/spi/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += spidev.h
diff --git a/include/linux/spi/spidev.h → include/uapi/linux/spi/spidev.h b/include/linux/spi/spidev.h → include/uapi/linux/spi/spidev.h