Merge tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux-headers

034b5eeb · Linus Torvalds <[email protected]> · 2012-10-13 13:26:39 -07:00

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 <[email protected]>
  Acked-by: Grant Likely <[email protected]>"

* tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/linux/spi

Commit: 034b5eeb6bc783e7f60e11299154556e65699e7a
Parents: 7c5a4734 · 7939d3c2

Merge commit. Changes below are compared with the first parent: 7c5a4734.

Changes

3 files changed · +1 −1

File	Status	Add	Del	Content
include/linux/spi/Kbuild	modified	+0	−1	View file
include/uapi/linux/spi/Kbuild	modified	+1	−0	View file
include/linux/spi/spidev.h → include/uapi/linux/spi/spidev.h	renamed	+0	−0	View file

include/linux/spi/Kbuild

View file

diff --git a/include/linux/spi/Kbuild b/include/linux/spi/Kbuild
index d375a08..e69de29 100644
--- a/include/linux/spi/Kbuild
+++ b/include/linux/spi/Kbuild
@@ -1 +0,0 @@
-header-y += spidev.h

include/uapi/linux/spi/Kbuild

View file

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

include/uapi/linux/spi/spidev.h

View file

diff --git a/include/linux/spi/spidev.h b/include/uapi/linux/spi/spidev.h
similarity index 100%
rename from include/linux/spi/spidev.h
rename to include/uapi/linux/spi/spidev.h