| Message ID | 20200806182059.2431-21-krzk@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,01/41] ARM: s3c: Remove unneeded machine header includes | expand |
On 2020-08-06 19:20, Krzysztof Kozlowski wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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 <arnd@arndb.de> > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > arch/arm/mach-s3c24xx/Makefile | 1 + > {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c | 0 > drivers/irqchip/Makefile | 1 - > 3 files changed, 1 insertion(+), 1 deletion(-) > rename {drivers/irqchip => arch/arm/mach-s3c24xx}/irq-s3c24xx.c (100%) > > diff --git a/arch/arm/mach-s3c24xx/Makefile > b/arch/arm/mach-s3c24xx/Makefile > index 6692f2de71b2..8c31f84f8c97 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 Acked-by: Marc Zyngier <maz@kernel.org> M. -- Jazz is not dead. It just smells funny...
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 6692f2de71b2..8c31f84f8c97 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