diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:14:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:14:29 +0200 |
| commit | ba8a3d6c7c1956c6ff54a96e23007beccaa95640 (patch) | |
| tree | a9625d6950d4d0c23557869b787fb0a16514c130 /include | |
| parent | Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge tag 'disintegrate-xen-20121009' of git://git.infradead.org/users/dhowel... (diff) | |
| download | linux-ba8a3d6c7c1956c6ff54a96e23007beccaa95640.tar.xz linux-ba8a3d6c7c1956c6ff54a96e23007beccaa95640.zip | |
Merge tag 'stable/for-linus-3.7-uapi-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen UAPI disintegration from Konrad Rzeszutek Wilk:
"This has the UAPI disintegration work done by David Howells"
* tag 'stable/for-linus-3.7-uapi-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
UAPI: (Scripted) Disintegrate include/xen
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/xen/Kbuild | 2 | ||||
| -rw-r--r-- | include/uapi/xen/evtchn.h (renamed from include/xen/evtchn.h) | 0 | ||||
| -rw-r--r-- | include/uapi/xen/privcmd.h (renamed from include/xen/privcmd.h) | 0 | ||||
| -rw-r--r-- | include/xen/Kbuild | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/xen/Kbuild b/include/uapi/xen/Kbuild index aafaa5aa54d4..61257cb14653 100644 --- a/include/uapi/xen/Kbuild +++ b/include/uapi/xen/Kbuild @@ -1 +1,3 @@ # UAPI Header export list +header-y += evtchn.h +header-y += privcmd.h diff --git a/include/xen/evtchn.h b/include/uapi/xen/evtchn.h index 14e833ee4e0b..14e833ee4e0b 100644 --- a/include/xen/evtchn.h +++ b/include/uapi/xen/evtchn.h diff --git a/include/xen/privcmd.h b/include/uapi/xen/privcmd.h index a85316811d79..a85316811d79 100644 --- a/include/xen/privcmd.h +++ b/include/uapi/xen/privcmd.h diff --git a/include/xen/Kbuild b/include/xen/Kbuild index 84ad8f02fee5..e69de29bb2d1 100644 --- a/include/xen/Kbuild +++ b/include/xen/Kbuild @@ -1,2 +0,0 @@ -header-y += evtchn.h -header-y += privcmd.h |