X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fppc%2Fkernel%2Firq.c;h=fbb2b9f8922cd2b4d160f5feb1cbc86e1ca5413a;hb=18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b;hp=772e428aaa59185bec486fe9a50b553fb4471abc;hpb=1f04c0a24b2f3cfe89c802a24396263623e3512d;p=linux-2.6

diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c
index 772e428aaa..fbb2b9f892 100644
--- a/arch/ppc/kernel/irq.c
+++ b/arch/ppc/kernel/irq.c
@@ -126,7 +126,7 @@ skip:
 			seq_puts(p, "  PowerPC             Thermal Assist (cpu temp)\n");
 		}
 #endif
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_MERGE)
 		/* should this be per processor send/receive? */
 		seq_printf(p, "IPI (recv/sent): %10u/%u\n",
 				atomic_read(&ipi_recv), atomic_read(&ipi_sent));