ppc64: remove ppc_irq_dispatch_handler

[karo-tx-linux.git] / arch / ppc / kernel / irq.c

diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c
index 8843f3af230fca05ade84ebe7444b5b708c5fc64..fbb2b9f8922cd2b4d160f5feb1cbc86e1ca5413a 100644 (file)
--- a/arch/ppc/kernel/irq.c
+++ b/arch/ppc/kernel/irq.c
@@ -57,6 +57,7 @@
 #include <asm/cache.h>
 #include <asm/prom.h>
 #include <asm/ptrace.h>
+#include <asm/machdep.h>
 
 #define NR_MASK_WORDS  ((NR_IRQS + 31) / 32)
 
@@ -125,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));