[irqchip: irq/irqchip-next] Revert "irqchip/mxs: Include linux/irqchip/mxs.h"

From: irqchip-bot for Marc Zyngier
Date: Wed Jun 21 2023 - 08:57:14 EST


The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID: d93c22199966696cfb76c6942797de2fbb22da24
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/d93c22199966696cfb76c6942797de2fbb22da24
Author: Marc Zyngier <maz@xxxxxxxxxx>
AuthorDate: Wed, 21 Jun 2023 13:46:25 +01:00
Committer: Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Wed, 21 Jun 2023 13:50:53 +01:00

Revert "irqchip/mxs: Include linux/irqchip/mxs.h"

This reverts commit 5b7e5676209120814dbb9fec8bc3769f0f7a7958.

Although including linux/irqchip/mxs.h is technically correct,
this clashes with the parallel removal of this include file
with 32bit ARM modernizing the low level irq handling as part of
5bb578a0c1b8 ("ARM: 9298/1: Drop custom mdesc->handle_irq()").

As such, this patch is not only unnecessary, it also breaks
compilation in -next. Revert it.

Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Shawn Guo <shawnguo@xxxxxxxxxx>
---
drivers/irqchip/irq-mxs.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c
index b3b1fba..55cb6b5 100644
--- a/drivers/irqchip/irq-mxs.c
+++ b/drivers/irqchip/irq-mxs.c
@@ -9,7 +9,6 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/irqchip.h>
-#include <linux/irqchip/mxs.h>
#include <linux/irqdomain.h>
#include <linux/io.h>
#include <linux/of.h>