[XenPPC] [linux-ppc-2.6] merge

[Xen patchbot-linux-ppc-2.6 <patchbot-linux-ppc-2.6@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID c875b3d2c5e55760b2f7a67a3dd5a248e874b78d
# Parent  dd0958aa23228c7210162d1a728ba5fb5b6965b6
# Parent  a9bd0554687d1afdd1afe81b34c72d872fa4393d
merge
---
 arch/powerpc/platforms/xen/setup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r dd0958aa2322 -r c875b3d2c5e5 arch/powerpc/platforms/xen/setup.c
--- a/arch/powerpc/platforms/xen/setup.c        Mon Aug 07 17:37:23 2006 -0400
+++ b/arch/powerpc/platforms/xen/setup.c        Mon Aug 07 17:39:11 2006 -0400
@@ -108,7 +108,7 @@ static void __init xen_init_early(void)
        DBG("    store_mfn      %llx\n", xen_start_info->store_mfn);
        DBG("    store_evtchn   %x\n", xen_start_info->store_evtchn);
        DBG("    console_mfn    %llx\n", xen_start_info->console_mfn);
-       DBG("    console_evtchn %x\n", xen_start_info->store_evtchn);
+       DBG("    console_evtchn %x\n", xen_start_info->console_evtchn);
 
        is_dom0 = !!(xen_start_info->flags & SIF_INITDOMAIN);
        

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