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
git-mirror · Oct 13, 2012 · ba8a3d6 · ba8a3d6
2 parents 125aae1 + 3245103
commit ba8a3d6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git 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 → include/uapi/xen/evtchn.h b/include/xen/evtchn.h → include/uapi/xen/evtchn.h
diff --git a/include/xen/privcmd.h → include/uapi/xen/privcmd.h b/include/xen/privcmd.h → include/uapi/xen/privcmd.h
diff --git a/include/xen/Kbuild b/include/xen/Kbuild
@@ -1,2 +0,0 @@
-header-y += evtchn.h
-header-y += privcmd.h