* [irqchip: irq/irqchip-next] nios2: Do not include linux/irqdomain.h from asm/irq.h
@ 2021-06-06 12:43 irqchip-bot for Marc Zyngier
0 siblings, 0 replies; 2+ messages in thread
From: irqchip-bot for Marc Zyngier @ 2021-06-06 12:43 UTC (permalink / raw)
To: linux-kernel; +Cc: Marc Zyngier, tglx
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 --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>
#endif
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [irqchip: irq/irqchip-next] nios2: Do not include linux/irqdomain.h from asm/irq.h
@ 2021-06-11 13:54 irqchip-bot for Marc Zyngier
0 siblings, 0 replies; 2+ messages in thread
From: irqchip-bot for Marc Zyngier @ 2021-06-11 13:54 UTC (permalink / raw)
To: linux-kernel; +Cc: Marc Zyngier, tglx
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 9bd1cc4148cbea44ca7d8254b50edb6cb660957a
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/9bd1cc4148cbea44ca7d8254b50edb6cb660957a
Author: Marc Zyngier <maz@kernel.org>
AuthorDate: Thu, 13 Sep 2018 10:59:03 +01:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Thu, 10 Jun 2021 13:09:15 +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 --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>
#endif
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-11 13:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-06 12:43 [irqchip: irq/irqchip-next] nios2: Do not include linux/irqdomain.h from asm/irq.h irqchip-bot for Marc Zyngier
2021-06-11 13:54 irqchip-bot for Marc Zyngier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).