atheros: v3.18: rearrange code between patches

[openwrt/svn-archive/archive.git] / target / linux / atheros / patches-3.18 / 105-ar2315_pci.patch

diff --git a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
index 8e3dfa1349a9c896c068f024ce21f11bfd416176..80256d414cf44c23ac5d13a9460bfa352ccebd53 100644 (file)
--- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
@@ -537,10 +537,10 @@
 +      default y
 --- a/arch/mips/ath25/ar2315.c
 +++ b/arch/mips/ath25/ar2315.c
-@@ -144,6 +144,10 @@ static void ar2315_irq_dispatch(void)
+@@ -139,6 +139,10 @@ static void ar2315_irq_dispatch(void)
+ 
+       if (pending & CAUSEF_IP3)
                do_IRQ(AR2315_IRQ_WLAN0);
-       else if (pending & CAUSEF_IP4)
-               do_IRQ(AR2315_IRQ_ENET0);
 +#ifdef CONFIG_PCI_AR2315
 +      else if (pending & CAUSEF_IP5)
 +              do_IRQ(AR2315_IRQ_LCBUS_PCI);
@@ -548,7 +548,7 @@
        else if (pending & CAUSEF_IP2)
                do_IRQ(AR2315_IRQ_MISC);
        else if (pending & CAUSEF_IP7)
-@@ -429,10 +433,62 @@ void __init ar2315_plat_mem_setup(void)
+@@ -303,10 +307,62 @@ void __init ar2315_plat_mem_setup(void)
        _machine_restart = ar2315_restart;
  }