summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-22 17:08:47 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-22 17:08:47 +0000
commit1e5f5ff8231c69e91a02782b2480a11aee42ddd6 (patch)
tree3a1a71d105d17c19a8e17f4d1c08fee7d905cac2 /target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
parent69120f3f477a3046e901d9f19cbfd1aa17c30575 (diff)
downloadmaster-31e0f0ae-1e5f5ff8231c69e91a02782b2480a11aee42ddd6.tar.gz
master-31e0f0ae-1e5f5ff8231c69e91a02782b2480a11aee42ddd6.tar.bz2
master-31e0f0ae-1e5f5ff8231c69e91a02782b2480a11aee42ddd6.zip
refresh patches
SVN-Revision: 22769
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch')
-rw-r--r--target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch b/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
index 289be17318..0e72267ab5 100644
--- a/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
+++ b/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
@@ -47,7 +47,7 @@
res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
-@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct
+@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct
pdata = pdev->dev.platform_data;
@@ -78,7 +78,7 @@
dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
phy_id = pdev->id;
-@@ -1268,7 +1264,7 @@ int __devinit cpmac_init(void)
+@@ -1269,7 +1265,7 @@ int __devinit cpmac_init(void)
}
cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):