aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-06-16 19:06:14 +0000
committerPeter Denison <openwrt@marshadder.org>2008-06-16 19:06:14 +0000
commit6b2276f3e3090dada21a7b1d3c835a3dfd3c74f7 (patch)
treedcd54fafed46860348dea7d01cd92035434d896a /target/linux/brcm47xx
parent61b097c195b2b9a80b242e469129b1747873058f (diff)
downloadupstream-6b2276f3e3090dada21a7b1d3c835a3dfd3c74f7.tar.gz
upstream-6b2276f3e3090dada21a7b1d3c835a3dfd3c74f7.tar.bz2
upstream-6b2276f3e3090dada21a7b1d3c835a3dfd3c74f7.zip
[brcm47xx] Fix TG3 build. Thanks Hauke Mehrtens
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11510 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
index 60576a262a..0291096fc4 100644
--- a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
@@ -990,8 +990,8 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
MI_COM_PHY_ADDR_MASK);
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
MI_COM_REG_ADDR_MASK);
-@@ -810,6 +817,11 @@ static void tg3_phydsp_write(struct tg3
- tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
+@@ -804,6 +811,11 @@ static int tg3_writephy(struct tg3 *tp,
+ return ret;
}
+static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
@@ -999,9 +999,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
+ return __tg3_writephy(tp, PHY_ADDR, reg, val);
+}
+
- static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable)
+ static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
{
- u32 phy;
+ tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t
}
}