From: Arnd Bergmann Date: Thu, 6 Aug 2020 18:20:38 +0000 (+0200) Subject: ARM: s3c24xx: move irqchip driver back into platform X-Git-Tag: iomap-folio-5.17-old~2871^2~14^2~18 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=95b415efff2cacb3ab3a159cc7aad1ec1ca3b81e;p=users%2Fwilly%2Flinux.git ARM: s3c24xx: move irqchip driver back into platform It was a good idea to move it out at first, but the irqchip code is still tightly connected to the s3c24xx platform code and uses multiple internal header files, so just move it back for the time being to avoid those dependencies. Signed-off-by: Arnd Bergmann Acked-by: Marc Zyngier Link: https://lore.kernel.org/r/20200806182059.2431-21-krzk@kernel.org Signed-off-by: Krzysztof Kozlowski --- diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index fbebc5f775e7..3ad297bd6b4a 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -8,6 +8,7 @@ # core obj-y += common.o +obj-y += irq-s3c24xx.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o diff --git a/drivers/irqchip/irq-s3c24xx.c b/arch/arm/mach-s3c24xx/irq-s3c24xx.c similarity index 100% rename from drivers/irqchip/irq-s3c24xx.c rename to arch/arm/mach-s3c24xx/irq-s3c24xx.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 133f9c45744a..8c983ad774f6 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_LPC32XX) += irq-lpc32xx.o obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o -obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o obj-$(CONFIG_OMPIC) += irq-ompic.o