summaryrefslogtreecommitdiff
path: root/include/linux/phy.h
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2017-09-04 21:40:34 +0300
committerJani Nikula <jani.nikula@intel.com>2017-09-04 21:40:34 +0300
commitd149d6ae17197ce23e2cd6bc5fcdacf7b593e55e (patch)
tree2fb8d66199080f6d7b41690f6e8616ccd79a1943 /include/linux/phy.h
parentafe722bee4bf8afc88c6ff7d6f781515d9428595 (diff)
parent7846b12fe0b5feab5446d892f41b5140c1419109 (diff)
downloadlinux-d149d6ae17197ce23e2cd6bc5fcdacf7b593e55e.tar.xz
Merge drm-upstream/drm-next into drm-intel-next-queued
Catch up with upstream while it's easy. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r--include/linux/phy.h2
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)
dev_err(&_phydev->mdio.dev, format, ##args)
#define phydev_dbg(_phydev, format, args...) \
- dev_dbg(&_phydev->mdio.dev, format, ##args);
+ dev_dbg(&_phydev->mdio.dev, format, ##args)
static inline const char *phydev_name(const struct phy_device *phydev)
{