diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2015-05-19 17:17:09 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-05-28 15:40:03 +0200 |
commit | 22b67acd99c00e3fdc66869cd43fd539bab0ef8c (patch) | |
tree | df3369d810b9b84355bcc540519c7312c629f880 | |
parent | ARM: 8367/1: sa1100: prepare for moving irq driver to drivers/irqchip (diff) | |
download | linux-22b67acd99c00e3fdc66869cd43fd539bab0ef8c.tar.xz linux-22b67acd99c00e3fdc66869cd43fd539bab0ef8c.zip |
ARM: 8368/1: sa1100: move irq driver to drivers/irqchip/
Move current sa11x0 IRQ driver to the irqchip subsystem.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-sa1100/Makefile | 2 | ||||
-rw-r--r-- | drivers/irqchip/Makefile | 1 | ||||
-rw-r--r-- | drivers/irqchip/irq-sa11x0.c (renamed from arch/arm/mach-sa1100/irq.c) | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 61ff91e76e0a..ebc4d58e1a32 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/arch/arm/mach-sa1100/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := clock.o generic.o irq.o #nmi-oopser.o +obj-y := clock.o generic.o #nmi-oopser.o # Specific board support obj-$(CONFIG_SA1100_ASSABET) += assabet.o diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index dda4927e47a6..49f372a168f9 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -47,3 +47,4 @@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o +obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o diff --git a/arch/arm/mach-sa1100/irq.c b/drivers/irqchip/irq-sa11x0.c index fdec5edbbfd5..97d257bd8b12 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/drivers/irqchip/irq-sa11x0.c @@ -1,6 +1,4 @@ /* - * linux/arch/arm/mach-sa1100/irq.c - * * Copyright (C) 2015 Dmitry Eremin-Solenikov * Copyright (C) 1999-2001 Nicolas Pitre * |