Skip to content

Commit

Permalink
mips/irq: prepare for drivers/irqchip/irqchip.h removal
Browse files Browse the repository at this point in the history
The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'.

See commit 91e20b5
("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>
  • Loading branch information
Joel Porquet authored and Thomas Gleixner committed Jul 31, 2015
1 parent fd4b267 commit 0a271c2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion arch/mips/ath79/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/bmips/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
3 changes: 1 addition & 2 deletions arch/mips/kernel/i8259.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 0a271c2

Please sign in to comment.