[x86] merge the olpc target with the x86 target, both tested and running

[openwrt.git] / target / linux / atheros / patches-2.6.31 / 105-ar2315_pci.patch

diff --git a/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch
index f5f0956..9b76dfe 100644 (file)
--- a/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-2.6.31/105-ar2315_pci.patch
@@ -256,7 +256,7 @@
 +      default y
 --- a/arch/mips/ar231x/ar2315.c
 +++ b/arch/mips/ar231x/ar2315.c
 +      default y
 --- a/arch/mips/ar231x/ar2315.c
 +++ b/arch/mips/ar231x/ar2315.c

-@@ -59,6 +59,27 @@ static inline void ar2315_gpio_irq(void)
+@@ -63,6 +63,27 @@ static inline void ar2315_gpio_irq(void)

                do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
  }
  
                do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
  }
  


@@ -284,7 +284,7 @@
  
  /*
   * Called when an interrupt is received, this function
  
  /*
   * Called when an interrupt is received, this function

-@@ -77,6 +98,10 @@ ar2315_irq_dispatch(void)
+@@ -81,6 +102,10 @@ ar2315_irq_dispatch(void)

                do_IRQ(AR2315_IRQ_WLAN0_INTRS);
        else if (pending & CAUSEF_IP4)
                do_IRQ(AR2315_IRQ_ENET0_INTRS);
                do_IRQ(AR2315_IRQ_WLAN0_INTRS);
        else if (pending & CAUSEF_IP4)
                do_IRQ(AR2315_IRQ_ENET0_INTRS);