Merge iSeries include file move

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

diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c
index f41afe545045ee6710e58206f83d752dd62df8b0..87474584033fe83774c37ba431b9c252d7d667ab 100644 (file)
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@ -52,7 +52,7 @@
 #include <asm/cache.h>
 #include <asm/prom.h>
 #include <asm/ptrace.h>
-#include <asm/iSeries/ItLpQueue.h>
+#include <asm/iseries/it_lp_queue.h>
 #include <asm/machdep.h>
 #include <asm/paca.h>
 
@@ -392,7 +392,7 @@ int virt_irq_create_mapping(unsigned int real_irq)
        if (ppc64_interrupt_controller == IC_OPEN_PIC)
                return real_irq;        /* no mapping for openpic (for now) */
 
-       if (ppc64_interrupt_controller == IC_BPA_IIC)
+       if (ppc64_interrupt_controller == IC_CELL_PIC)
                return real_irq;        /* no mapping for iic either */
 
        /* don't map interrupts < MIN_VIRT_IRQ */