diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-10-31 13:10:49 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-10-31 13:10:49 +0000 |
commit | 9069f702b3aef44be866c0657de94c448830e042 (patch) | |
tree | 68a9bdce3bacc09e7458eaabc34d76ac635298b7 /target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch | |
parent | 57aa0caf28ab6717f671cd5551bc8ab4fc178129 (diff) | |
download | upstream-9069f702b3aef44be866c0657de94c448830e042.tar.gz upstream-9069f702b3aef44be866c0657de94c448830e042.tar.bz2 upstream-9069f702b3aef44be866c0657de94c448830e042.zip |
[ar7] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23736 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch')
-rw-r--r-- | target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch index d7bbc429bf..941d8889c1 100644 --- a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch +++ b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch @@ -21,7 +21,7 @@ static void cpmac_dump_regs(struct net_device *dev) { int i; -@@ -1111,9 +1118,13 @@ static int __devinit cpmac_probe(struct +@@ -1111,9 +1118,13 @@ static int __devinit cpmac_probe(struct struct cpmac_priv *priv; struct net_device *dev; struct plat_cpmac_data *pdata; @@ -35,7 +35,7 @@ for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) { if (!(pdata->phy_mask & (1 << phy_id))) continue; -@@ -1122,12 +1133,43 @@ static int __devinit cpmac_probe(struct +@@ -1122,12 +1133,43 @@ static int __devinit cpmac_probe(struct strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE); break; } |