aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/i386/io_apic.c
diff options
context:
space:
mode:
authorrn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net>2003-03-14 15:58:24 +0000
committerrn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net>2003-03-14 15:58:24 +0000
commit0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch)
treebab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xen/arch/i386/io_apic.c
parentd9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff)
parentf9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff)
downloadxen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz
xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2
xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xen/arch/i386/io_apic.c')
-rw-r--r--xen/arch/i386/io_apic.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/xen/arch/i386/io_apic.c b/xen/arch/i386/io_apic.c
index 878c189afb..6ad37f2399 100644
--- a/xen/arch/i386/io_apic.c
+++ b/xen/arch/i386/io_apic.c
@@ -826,7 +826,6 @@ void __init print_IO_APIC(void)
UNEXPECTED_IO_APIC();
}
-#if 0
printk(KERN_DEBUG ".... IRQ redirection table:\n");
printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
@@ -871,7 +870,6 @@ void __init print_IO_APIC(void)
entry = irq_2_pin + entry->next;
}
printk("\n");
-#endif
}
printk(KERN_INFO ".................................... done.\n");