diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-02-16 23:47:43 +0300 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2018-02-16 23:47:43 +0300 |
commit | d4da404f36b24b089d20db1fb27d8f99cb66f409 (patch) | |
tree | 349c4b792281826652eb9e6d7a46ed6622dc90de /drivers/net/phy/uPD60620.c | |
parent | fa4127c5eb8def998fd8a471d51a4f2560dea0a2 (diff) | |
parent | 933519a5a269d8460450545adefcb5caec622cac (diff) | |
download | linux-d4da404f36b24b089d20db1fb27d8f99cb66f409.tar.xz |
Merge airlied/drm-next into drm-misc-next
Backmerge 4.15 and hdcp topic branch
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/net/phy/uPD60620.c')
-rw-r--r-- | drivers/net/phy/uPD60620.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/phy/uPD60620.c b/drivers/net/phy/uPD60620.c index 96b33475ea5e..55f48ee3595a 100644 --- a/drivers/net/phy/uPD60620.c +++ b/drivers/net/phy/uPD60620.c @@ -95,7 +95,6 @@ static struct phy_driver upd60620_driver[1] = { { .features = PHY_BASIC_FEATURES, .flags = 0, .config_init = upd60620_config_init, - .config_aneg = genphy_config_aneg, .read_status = upd60620_read_status, } }; |