mips/irq: prepare for drivers/irqchip/irqchip.h removal
authorJoel Porquet <joel@porquet.org>
Tue, 7 Jul 2015 21:17:33 +0000 (17:17 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 31 Jul 2015 18:51:21 +0000 (20:51 +0200)
The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'.

See commit 91e20b5040c67c51aad88cf87db4305c5bd7f79d
("irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h").

This patch removes inclusions of private header 'drivers/irqchip/irqchip.h'and
replaces them with the inclusion of 'include/linux/irqchip.h'.

Signed-off-by: Joel Porquet <joel@porquet.org>
Cc: vgupta@synopsys.com
Cc: monstr@monstr.eu
Cc: ralf@linux-mips.org
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/3357968.0IznKtY3Q9@joel-zenbook
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/mips/ath79/irq.c
arch/mips/bmips/irq.c
arch/mips/kernel/i8259.c

index afb009603f7fad138ccc12a1c26ffc7bd5422bf6..2021be20d9d940513baf267a7d20a5cedfca8bd2 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip.h>
 #include <linux/of_irq.h>
-#include "../../../drivers/irqchip/irqchip.h"
 
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
index 14552e58ff7e46463725d35fd3036c62a2901cca..e7fc6f9348baa2e6bc06f881ced25aec7fb40b46 100644 (file)
@@ -34,5 +34,5 @@ void __init arch_init_irq(void)
        irqchip_init();
 }
 
-OF_DECLARE_2(irqchip, mips_cpu_intc, "mti,cpu-interrupt-controller",
+IRQCHIP_DECLARE(mips_cpu_intc, "mti,cpu-interrupt-controller",
             mips_cpu_irq_of_init);
index 74f6752814d342387d1182e6d779fb15c1235691..a8acee7eab923ccf2e5e1044414a256b0355b6e5 100644 (file)
 #include <linux/spinlock.h>
 #include <linux/syscore_ops.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
 
 #include <asm/i8259.h>
 #include <asm/io.h>
 
-#include "../../drivers/irqchip/irqchip.h"
-
 /*
  * This is the 'legacy' 8259A Programmable Interrupt Controller,
  * present in the majority of PC/AT boxes.