aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
commitd87efd8c3c2acd5d0f96b25514282a84f425419f (patch)
tree1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
parent1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff)
downloadupstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch b/target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
index fd45e61e4c..a32817db2d 100644
--- a/target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
+++ b/target/linux/lantiq/patches-3.2/0007-MIPS-lantiq-make-irq.c-support-the-FALC-ON.patch
@@ -16,11 +16,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/lantiq/irq.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
-diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
-index f9737bb..17c057f 100644
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
-@@ -195,7 +195,7 @@ static void ltq_hw_irqdispatch(int module)
+@@ -195,7 +195,7 @@ static void ltq_hw_irqdispatch(int modul
do_IRQ((int)irq + INT_NUM_IM0_IRL0 + (INT_NUM_IM_OFFSET * module));
/* if this is a EBU irq, we need to ack it or get a deadlock */
@@ -38,14 +36,15 @@ index f9737bb..17c057f 100644
+ if (LTQ_EIU_BASE_ADDR) {
+ if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0)
+ panic("Failed to insert eiu memory\n");
-
-- if (request_mem_region(ltq_eiu_resource.start,
-- resource_size(&ltq_eiu_resource), "eiu") < 0)
-- panic("Failed to request eiu memory\n");
++
+ if (request_mem_region(ltq_eiu_resource.start,
+ resource_size(&ltq_eiu_resource), "eiu") < 0)
+ panic("Failed to request eiu memory\n");
+- if (request_mem_region(ltq_eiu_resource.start,
+- resource_size(&ltq_eiu_resource), "eiu") < 0)
+- panic("Failed to request eiu memory\n");
+-
- ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
+ ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
resource_size(&ltq_eiu_resource));
@@ -68,6 +67,3 @@ index f9737bb..17c057f 100644
irq_set_chip_and_handler(i, &ltq_eiu_type,
handle_level_irq);
/* EIU3-5 only exist on ar9 and vr9 */
---
-1.7.7.1
-