ixp4xx: add linux 2.6.29 patches (TODO: re-integrate switch/multi-phy support)

[openwrt.git] / target / linux / atheros / patches-2.6.28 / 100-board.patch

diff --git a/target/linux/atheros/patches-2.6.28/100-board.patch b/target/linux/atheros/patches-2.6.28/100-board.patch
index 6f27d1a..8b76d07 100644 (file)
--- a/target/linux/atheros/patches-2.6.28/100-board.patch
+++ b/target/linux/atheros/patches-2.6.28/100-board.patch
@@ -1924,7 +1924,7 @@
 +              if (!ar231x_board.radio)
 +                      return 0;
 +
-+              if (*((u32 *) ar231x_board.radio) & AR531X_RADIO0_MASK)
++              if (*((u32 *) radio) & AR531X_RADIO0_MASK)
 +                      ar231x_add_wmac(0, AR531X_WLAN0,
 +                              AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1948,7 +1948,7 @@
 +              break;
 +      }
 +
-+      if (*((u32 *) ar231x_board.radio) & AR531X_RADIO1_MASK)
++      if (*((u32 *) radio) & AR531X_RADIO1_MASK)
 +              ar231x_add_wmac(1, AR531X_WLAN1,
 +                      AR5312_IRQ_WLAN1_INTRS);
 +
@@ -2096,7 +2096,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar2315.c
-@@ -0,0 +1,679 @@
+@@ -0,0 +1,677 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -2149,10 +2149,8 @@
 +
 +      if (pend) {
 +              bit = fls(pend) - 1;
-+              printk("GPIO IRQ: pend=0x%08x, val=%08x, bit=%d\n", pend, gpiointval, bit);
 +              pend &= ~(1 << bit);
 +              gpiointval ^= (1 << bit);
-+              printk("AFTER IRQ: pend=0x%08x, val=%08x, bit=%d\n", pend, gpiointval, bit);
 +      }
 +
 +      if (!pend)