diff options
| author | Joel Porquet <joel@porquet.org> | 2015-07-07 23:17:33 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-31 20:51:21 +0200 |
| commit | 0a271c2a34deb98a81f94fc87380287f3a8c9c72 (patch) | |
| tree | 1aabb8e96e8b4c6d242f948d6fec983cb37fb62a | |
| parent | microblaze/irq: prepare for drivers/irqchip/irqchip.h removal (diff) | |
| download | linux-0a271c2a34deb98a81f94fc87380287f3a8c9c72.tar.xz linux-0a271c2a34deb98a81f94fc87380287f3a8c9c72.zip | |
mips/irq: prepare for drivers/irqchip/irqchip.h removal
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>
| -rw-r--r-- | arch/mips/ath79/irq.c | 1 | ||||
| -rw-r--r-- | arch/mips/bmips/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/i8259.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c index afb009603f7f..2021be20d9d9 100644 --- a/arch/mips/ath79/irq.c +++ b/arch/mips/ath79/irq.c @@ -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> diff --git a/arch/mips/bmips/irq.c b/arch/mips/bmips/irq.c index 14552e58ff7e..e7fc6f9348ba 100644 --- a/arch/mips/bmips/irq.c +++ b/arch/mips/bmips/irq.c @@ -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); diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index 74f6752814d3..a8acee7eab92 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c @@ -18,12 +18,11 @@ #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. |