[Xen-changelog] Adapt xen-ia64 to changes in xen-unstable

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 71c61c288171fa5a4013ee20e75c9a2709bf0f84
# Parent  cd914808acf1f5a32fc6fa575432cd96f9a4ad10
Adapt xen-ia64 to changes in xen-unstable

diff -r cd914808acf1 -r 71c61c288171 tools/libxc/xc_ia64_stubs.c
--- a/tools/libxc/xc_ia64_stubs.c       Tue Jan  3 16:19:20 2006
+++ b/tools/libxc/xc_ia64_stubs.c       Tue Jan  3 16:20:05 2006
@@ -627,6 +627,7 @@
                  unsigned int control_evtchn,
                  unsigned int lapic,
                  unsigned int vcpus,
+                 unsigned int acpi,
                  unsigned int store_evtchn,
                  unsigned long *store_mfn)
 {
diff -r cd914808acf1 -r 71c61c288171 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Tue Jan  3 16:19:20 2006
+++ b/xen/arch/ia64/xen/domain.c        Tue Jan  3 16:20:05 2006
@@ -19,6 +19,7 @@
 #include <xen/delay.h>
 #include <xen/softirq.h>
 #include <xen/mm.h>
+#include <xen/iocap.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/io.h>

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog