diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-01-06 07:51:15 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-01-06 07:51:15 +0100 |
commit | 31c7ac388aa905a196ee16dff2015111f701f035 (patch) | |
tree | 09a43dde7fbf30ce57eaf5ba7ebda84da961538d /drivers/net/phy/aquantia_main.c | |
parent | 28336be568bb473d16ba80db0801276fb4f1bbe5 (diff) | |
parent | c79f46a282390e0f5b306007bf7b11a46d529538 (diff) |
Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/phy/aquantia_main.c')
-rw-r--r-- | drivers/net/phy/aquantia_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c index 3b29d381116f..975789d9349d 100644 --- a/drivers/net/phy/aquantia_main.c +++ b/drivers/net/phy/aquantia_main.c @@ -627,6 +627,8 @@ static struct phy_driver aqr_driver[] = { .config_intr = aqr_config_intr, .ack_interrupt = aqr_ack_interrupt, .read_status = aqr_read_status, + .suspend = aqr107_suspend, + .resume = aqr107_resume, }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106), |