[irqchip:,irq/irqchip-next] nios2: Do not include linux/irqdomain.h from asm/irq.h
diff mbox series

Message ID 162298343616.29796.542984438945877584.tip-bot2@tip-bot2
State Accepted
Commit 9bd1cc4148cbea44ca7d8254b50edb6cb660957a
Headers show
  • [irqchip:,irq/irqchip-next] nios2: Do not include linux/irqdomain.h from asm/irq.h
Related show

Commit Message

tip-bot2 for Michal Suchanek June 6, 2021, 12:43 p.m. UTC
The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     41188caed10a9d23f08ff5b693c84863fbfbc21e
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/41188caed10a9d23f08ff5b693c84863fbfbc21e
Author:        Marc Zyngier <maz@kernel.org>
AuthorDate:    Thu, 13 Sep 2018 10:59:03 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Wed, 02 Jun 2021 14:34:46 +01:00

nios2: Do not include linux/irqdomain.h from asm/irq.h

Including linux/irqdomain.h from asm/irq.h is going to break
as soon as linux/irqdomain.h will include linux/irq.h, so
let's fix this. Code relying on linux/irqomain.h should include
it directly.

Signed-off-by: Marc Zyngier <maz@kernel.org>
 arch/nios2/include/asm/irq.h | 1 -
 arch/nios2/kernel/irq.c      | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/arch/nios2/include/asm/irq.h b/arch/nios2/include/asm/irq.h
index 13ce372..c52c948 100644
--- a/arch/nios2/include/asm/irq.h
+++ b/arch/nios2/include/asm/irq.h
@@ -10,6 +10,5 @@ 
 #define NIOS2_CPU_NR_IRQS	32
 #include <asm-generic/irq.h>
-#include <linux/irqdomain.h>
diff --git a/arch/nios2/kernel/irq.c b/arch/nios2/kernel/irq.c
index 5f3555c..c6a1a9f 100644
--- a/arch/nios2/kernel/irq.c
+++ b/arch/nios2/kernel/irq.c
@@ -11,6 +11,7 @@ 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
 #include <linux/of.h>
 static u32 ienable;