aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch)
treec76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
parent3951f9492f31b59602a9a7c46fbb041be0929be0 (diff)
downloadupstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2
upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43564
Diffstat (limited to 'target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch')
-rw-r--r--target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch20
1 files changed, 7 insertions, 13 deletions
diff --git a/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch b/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
index 6406a3f554..b319fd3bf8 100644
--- a/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
+++ b/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
@@ -1,7 +1,5 @@
-Index: linux-3.14.18/drivers/irqchip/Kconfig
-===================================================================
---- linux-3.14.18.orig/drivers/irqchip/Kconfig
-+++ linux-3.14.18/drivers/irqchip/Kconfig
+--- a/drivers/irqchip/Kconfig
++++ b/drivers/irqchip/Kconfig
@@ -10,6 +10,11 @@ config ARM_GIC
config GIC_NON_BANKED
bool
@@ -14,10 +12,8 @@ Index: linux-3.14.18/drivers/irqchip/Kconfig
config ARM_NVIC
bool
select IRQ_DOMAIN
-Index: linux-3.14.18/drivers/irqchip/Makefile
-===================================================================
---- linux-3.14.18.orig/drivers/irqchip/Makefile
-+++ linux-3.14.18/drivers/irqchip/Makefile
+--- a/drivers/irqchip/Makefile
++++ b/drivers/irqchip/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc.
obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o
obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o
@@ -26,11 +22,9 @@ Index: linux-3.14.18/drivers/irqchip/Makefile
obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o
obj-$(CONFIG_ARCH_NSPIRE) += irq-zevio.o
obj-$(CONFIG_ARCH_VT8500) += irq-vt8500.o
-Index: linux-3.14.18/drivers/irqchip/irq-gic.c
-===================================================================
---- linux-3.14.18.orig/drivers/irqchip/irq-gic.c
-+++ linux-3.14.18/drivers/irqchip/irq-gic.c
-@@ -1015,6 +1015,7 @@ IRQCHIP_DECLARE(gic_400, "arm,gic-400",
+--- a/drivers/irqchip/irq-gic.c
++++ b/drivers/irqchip/irq-gic.c
+@@ -1015,6 +1015,7 @@ IRQCHIP_DECLARE(gic_400, "arm,gic-400",
IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);