summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-22 17:08:47 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-22 17:08:47 +0000
commit72015e72cf1d2686dc3a4c09e7facea3481d3267 (patch)
tree111de93f7b01afa944581b543658f4e71514379a /target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
parent56572f716fc33a0e156f4de138be381e118e88e6 (diff)
[ar7] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22769 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 289be1731..0e72267ab 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):