diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 10:01:37 +0100 |
| commit | 3eb93ea3272d428aab3c03e2dd272a78a7729ba8 (patch) | |
| tree | 63ca8b7e7feccb109f4b5cb868939da395c7632f /include/linux/phy.h | |
| parent | 5927145efd5de71976e62e2822511b13014d7e56 (diff) | |
| parent | 565977a3d929fc4427769117a8ac976ec16776d5 (diff) | |
Merge branch 'x86/mm' into x86/dma, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 5a0c3e53e7c2..d7069539f351 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -924,6 +924,7 @@ void phy_device_remove(struct phy_device *phydev); int phy_init_hw(struct phy_device *phydev); int phy_suspend(struct phy_device *phydev); int phy_resume(struct phy_device *phydev); +int __phy_resume(struct phy_device *phydev); int phy_loopback(struct phy_device *phydev, bool enable); struct phy_device *phy_attach(struct net_device *dev, const char *bus_id, phy_interface_t interface); |