xen-changelog

[Top] [All Lists]

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

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] [IA64] fix merge error with xen-unstable.hg
From:	Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Fri, 28 Jul 2006 16:21:36 +0000
Delivery-date:	Fri, 28 Jul 2006 09:30:11 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] [IA64] fix merge error with xen-unstable.hg, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] merge with xen-unstable.hg, Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] [IA64] increase buffer size in panic_domain()., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] [IA64] remove unnecessary panic_domain() declarations, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] [IA64] increase buffer size in panic_domain()., Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]