summaryrefslogtreecommitdiffstats
path: root/include/linux/phy
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2018-06-25 09:20:40 -0700
committerJames Morris <james.morris@microsoft.com>2018-06-25 09:20:40 -0700
commit57b54d74dd5c559bd35f2affaf11d8828aaf5733 (patch)
tree025d99f0d6b298fbdbf3ce942ec7868131444090 /include/linux/phy
parent65793f3cd93abf4ca1109f78e07c1b7193abdfec (diff)
parent7daf201d7fe8334e2d2364d4e8ed3394ec9af819 (diff)
downloadcachepc-linux-57b54d74dd5c559bd35f2affaf11d8828aaf5733.tar.gz
cachepc-linux-57b54d74dd5c559bd35f2affaf11d8828aaf5733.zip
Merge tag 'v4.18-rc2' into next-general
Merge to Linux 4.18-rc2 for security subsystem developers.
Diffstat (limited to 'include/linux/phy')
-rw-r--r--include/linux/phy/phy.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index c9d14eeee7f5..9713aebdd348 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -36,6 +36,7 @@ enum phy_mode {
PHY_MODE_USB_DEVICE_SS,
PHY_MODE_USB_OTG,
PHY_MODE_SGMII,
+ PHY_MODE_2500SGMII,
PHY_MODE_10GKR,
PHY_MODE_UFS_HS_A,
PHY_MODE_UFS_HS_B,