diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 22:26:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 22:26:39 +0200 |
| commit | 034b5eeb6bc783e7f60e11299154556e65699e7a (patch) | |
| tree | 3afbe5520e5d95ea99b1db9caf3884282a829d67 /include | |
| parent | Merge tag 'openrisc-uapi' of git://openrisc.net/jonas/linux (diff) | |
| parent | UAPI: (Scripted) Disintegrate include/linux/spi (diff) | |
| download | linux-034b5eeb6bc783e7f60e11299154556e65699e7a.tar.xz linux-034b5eeb6bc783e7f60e11299154556e65699e7a.zip | |
Merge tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/spi/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/spi/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/spi/spidev.h (renamed from include/linux/spi/spidev.h) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/Kbuild b/include/linux/spi/Kbuild index d375a082986e..e69de29bb2d1 100644 --- 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 index aafaa5aa54d4..0cc747eff165 100644 --- 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 b/include/uapi/linux/spi/spidev.h index 52d9ed01855f..52d9ed01855f 100644 --- a/include/linux/spi/spidev.h +++ b/include/uapi/linux/spi/spidev.h |