[Xen-changelog] [xen-unstable] [IA64] fix merge error with xen-unstable.hg

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 97cc7ed90061a5b163e3fda7d5c94d947e417696
# Parent  f7b43e5c42b981fa16ad9bfc5339ff8496dd2288
[IA64] fix merge error with xen-unstable.hg

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 tools/libxc/Makefile |    1 +
 1 files changed, 1 insertion(+)

diff -r f7b43e5c42b9 -r 97cc7ed90061 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Tue Jul 25 12:19:05 2006 -0600
+++ b/tools/libxc/Makefile      Tue Jul 25 12:39:01 2006 -0600
@@ -31,6 +31,7 @@ GUEST_SRCS-y += xg_private.c
 GUEST_SRCS-y += xg_private.c
 GUEST_SRCS-$(CONFIG_POWERPC) += xc_ppc_linux_build.c
 GUEST_SRCS-$(CONFIG_X86) += xc_linux_build.c
+GUEST_SRCS-$(CONFIG_IA64) += xc_linux_build.c
 GUEST_SRCS-$(CONFIG_MIGRATE) += xc_linux_restore.c xc_linux_save.c
 GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
 

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