diff options
| author |   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-10-10 09:25:16 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-10-10 09:25:23 -0400 |
| commit | 32451033b04e288f75e69f8eb6664e6452a2cca0 (patch) | |
| tree | 5efd561fbefca3dae799f7fc3a44ee7b838676f8 /include | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| parent | UAPI: (Scripted) Disintegrate include/xen (diff) | |
| download | linux-dev-32451033b04e288f75e69f8eb6664e6452a2cca0.tar.xz linux-dev-32451033b04e288f75e69f8eb6664e6452a2cca0.zip | |
Merge tag 'disintegrate-xen-20121009' of git://git.infradead.org/users/dhowells/linux-headers into stable/for-linus-3.7-uapi
UAPI Disintegration 2012-10-09
* tag 'disintegrate-xen-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate include/xen
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
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 |