projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
net
/
ethernet
/
cadence
/
macb.c
diff --git
a/drivers/net/ethernet/cadence/macb.c
b/drivers/net/ethernet/cadence/macb.c
index
b9d4bb9
..
7903943
100644
(file)
--- a/
drivers/net/ethernet/cadence/macb.c
+++ b/
drivers/net/ethernet/cadence/macb.c
@@
-287,7
+287,7
@@
static int macb_mii_probe(struct net_device *dev)
}
/* attach the mac to the phy */
- ret = phy_connect_direct(dev, phydev, &macb_handle_link_change,
0,
+ ret = phy_connect_direct(dev, phydev, &macb_handle_link_change,
bp->phy_interface);
if (ret) {
netdev_err(dev, "Could not attach to PHY\n");