diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 12:04:15 -0400 |
| commit | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (patch) | |
| tree | 411b1d357731db5e2611f0ca67082a8c909b7d9d /include/linux/phy.h | |
| parent | 75864b301c91bf41ec2fb49ce4efb62fcb48b954 (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 2a9567bb8186..0bb5b212ab42 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -830,7 +830,7 @@ static inline int phy_read_status(struct phy_device *phydev) | |||
| 830 | dev_err(&_phydev->mdio.dev, format, ##args) | 830 | dev_err(&_phydev->mdio.dev, format, ##args) |
| 831 | 831 | ||
| 832 | #define phydev_dbg(_phydev, format, args...) \ | 832 | #define phydev_dbg(_phydev, format, args...) \ |
| 833 | dev_dbg(&_phydev->mdio.dev, format, ##args); | 833 | dev_dbg(&_phydev->mdio.dev, format, ##args) |
| 834 | 834 | ||
| 835 | static inline const char *phydev_name(const struct phy_device *phydev) | 835 | static inline const char *phydev_name(const struct phy_device *phydev) |
| 836 | { | 836 | { |