Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a271c2a authored by Joel Porquet's avatar Joel Porquet Committed by Thomas Gleixner
Browse files

mips/irq: prepare for drivers/irqchip/irqchip.h removal 



The IRQCHIP_DECLARE macro migrated to 'include/linux/irqchip.h'.

See commit 91e20b50
("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: default avatarJoel 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent fd4b267b

arch/mips/ath79/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/mips/bmips/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/mips/kernel/i8259.c

+1 −2
Original line number Diff line number Diff line
@@ -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.