kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / ramips / patches-3.14 / 0025-MIPS-ralink-allow-loading-irq-registers-from-the-dev.patch

diff --git a/target/linux/ramips/patches-3.14/0025-MIPS-ralink-allow-loading-irq-registers-from-the-dev.patch b/target/linux/ramips/patches-3.14/0025-MIPS-ralink-allow-loading-irq-registers-from-the-dev.patch
index 3a114d0699d69d0e1ca5cc9264db14c84ea24320..f21ca3c7de7e53e210a424f3757bb71373a5efcb 100644 (file)
--- a/target/linux/ramips/patches-3.14/0025-MIPS-ralink-allow-loading-irq-registers-from-the-dev.patch
+++ b/target/linux/ramips/patches-3.14/0025-MIPS-ralink-allow-loading-irq-registers-from-the-dev.patch
@@ -9,8 +9,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  arch/mips/ralink/irq.c |   33 +++++++++++++++++++++++----------
  1 file changed, 23 insertions(+), 10 deletions(-)
 
  arch/mips/ralink/irq.c |   33 +++++++++++++++++++++++----------
  1 file changed, 23 insertions(+), 10 deletions(-)
 

-diff --git a/arch/mips/ralink/irq.c b/arch/mips/ralink/irq.c
-index 781b3d1..82c3146 100644

 --- a/arch/mips/ralink/irq.c
 +++ b/arch/mips/ralink/irq.c
 @@ -20,14 +20,6 @@
 --- a/arch/mips/ralink/irq.c
 +++ b/arch/mips/ralink/irq.c
 @@ -20,14 +20,6 @@


@@ -65,7 +63,7 @@ index 781b3d1..82c3146 100644
  }
  
  static void ralink_intc_irq_unmask(struct irq_data *d)
  }
  
  static void ralink_intc_irq_unmask(struct irq_data *d)

-@@ -134,6 +144,9 @@ static int __init intc_of_init(struct device_node *node,
+@@ -134,6 +144,9 @@ static int __init intc_of_init(struct de

        struct irq_domain *domain;
        int irq;
  
        struct irq_domain *domain;
        int irq;
  


@@ -75,6 +73,3 @@ index 781b3d1..82c3146 100644
        irq = irq_of_parse_and_map(node, 0);
        if (!irq)
                panic("Failed to get INTC IRQ");
        irq = irq_of_parse_and_map(node, 0);
        if (!irq)
                panic("Failed to get INTC IRQ");

--- 
-1.7.10.4
-