aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-10-31 13:10:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-10-31 13:10:49 +0000
commit56eaf842c7bb55519b15e0cd0411948e9ad18f42 (patch)
tree00fd7e3f020cfbea79ae332d1ff781809c5f410c /target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
parenta621fdb419bc36189818fd0791a15664c4359a46 (diff)
downloadupstream-56eaf842c7bb55519b15e0cd0411948e9ad18f42.tar.gz
upstream-56eaf842c7bb55519b15e0cd0411948e9ad18f42.tar.bz2
upstream-56eaf842c7bb55519b15e0cd0411948e9ad18f42.zip
refresh 2.6.32 patches
SVN-Revision: 23736
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.patch4
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;
}