diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2015-05-19 11:17:09 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-05-28 09:40:03 -0400 |
commit | 22b67acd99c00e3fdc66869cd43fd539bab0ef8c (patch) | |
tree | df3369d810b9b84355bcc540519c7312c629f880 | |
parent | 85e6f09785bd06f0510bdb00c40772c7f8da3c43 (diff) |
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 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := clock.o generic.o irq.o #nmi-oopser.o | 6 | obj-y := clock.o generic.o #nmi-oopser.o |
7 | 7 | ||
8 | # Specific board support | 8 | # Specific board support |
9 | obj-$(CONFIG_SA1100_ASSABET) += assabet.o | 9 | 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 | |||
47 | obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o | 47 | obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o |
48 | obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o | 48 | obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o |
49 | obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o | 49 | obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o |
50 | 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 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/arm/mach-sa1100/irq.c | ||
3 | * | ||
4 | * Copyright (C) 2015 Dmitry Eremin-Solenikov | 2 | * Copyright (C) 2015 Dmitry Eremin-Solenikov |
5 | * Copyright (C) 1999-2001 Nicolas Pitre | 3 | * Copyright (C) 1999-2001 Nicolas Pitre |
6 | * | 4 | * |