1 files changed, 5 insertions, 3 deletions

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 7da5fa84595..79f337c4738 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -26,7 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/mod_devicetable.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #define PHY_BASIC_FEATURES      (SUPPORTED_10baseT_Half | \
                                  SUPPORTED_10baseT_Full | \
@@ -53,6 +53,7 @@
 
 /* Interface Mode definitions */
 typedef enum {
+        PHY_INTERFACE_MODE_NA,
         PHY_INTERFACE_MODE_MII,
         PHY_INTERFACE_MODE_GMII,
         PHY_INTERFACE_MODE_SGMII,
@@ -62,7 +63,8 @@ typedef enum {
         PHY_INTERFACE_MODE_RGMII_ID,
         PHY_INTERFACE_MODE_RGMII_RXID,
         PHY_INTERFACE_MODE_RGMII_TXID,
-        PHY_INTERFACE_MODE_RTBI
+        PHY_INTERFACE_MODE_RTBI,
+        PHY_INTERFACE_MODE_SMII,
 } phy_interface_t;
 
 
@@ -418,7 +420,7 @@ struct phy_driver {
 
         /*
          * Requests a Tx timestamp for 'skb'. The phy driver promises
-         * to deliver it to the socket's error queue as soon as a
+         * to deliver it using skb_complete_tx_timestamp() as soon as a
          * timestamp becomes available. One of the PTP_CLASS_ values
          * is passed in 'type'.
          */