diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-23 05:05:13 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-23 05:05:13 +0300 |
| commit | 65d1086c44791112188f6aebbdc3a27cab3736d3 (patch) | |
| tree | f769c133e61c54e34e91aa9ecf1d3504a6eb4fb4 /drivers/net/phy/phy_device.c | |
| parent | edd849e5448c4f6ddc04a5fa1ac5479176660c27 (diff) | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
| download | linux-65d1086c44791112188f6aebbdc3a27cab3736d3.tar.xz | |
BackMerge tag 'v4.11-rc3' into drm-next
Linux 4.11-rc3 as requested by Daniel
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index daec6555f3b1..5198ccfa347f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1864,7 +1864,7 @@ static struct phy_driver genphy_driver[] = { .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic PHY", - .soft_reset = genphy_soft_reset, + .soft_reset = genphy_no_soft_reset, .config_init = genphy_config_init, .features = PHY_GBIT_FEATURES | SUPPORTED_MII | SUPPORTED_AUI | SUPPORTED_FIBRE | |