diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 11:43:40 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 11:43:40 -0700 |
| commit | 91de76e661a266731fc2889a398ad1694df9d523 (patch) | |
| tree | ecc278f000f18e5b2b880f61ee4b0e68ebd1d6d4 /include/linux/phy/phy.h | |
| parent | aed5d0ee77c007dcdcaf48ea75be008f05a241be (diff) | |
| parent | bb176f67090ca54869fc1262c913aa69d2ede070 (diff) | |
| download | lwn-91de76e661a266731fc2889a398ad1694df9d523.tar.gz lwn-91de76e661a266731fc2889a398ad1694df9d523.zip | |
Merge tag 'v4.14-rc6' into next
Merge with mainline to bring in the timer API changes.
Diffstat (limited to 'include/linux/phy/phy.h')
| -rw-r--r-- | include/linux/phy/phy.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h index 78bb0d7f6b11..e694d4008c4a 100644 --- a/include/linux/phy/phy.h +++ b/include/linux/phy/phy.h @@ -27,6 +27,8 @@ enum phy_mode { PHY_MODE_USB_HOST, PHY_MODE_USB_DEVICE, PHY_MODE_USB_OTG, + PHY_MODE_SGMII, + PHY_MODE_10GKR, }; /** |