From 74706e81df27c3014ab041423bfdd14ff63b3c2f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 29 Feb 2012 14:23:27 +0000
Subject: [PATCH] --- yaml --- r: 290526 b: refs/heads/master c:
 9c717758c9289331e22c88ef69d8c248def9cd29 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/Kbuild | 1 +
 trunk/include/linux/mdio.h | 9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 04d3f95ca12b..8ac01942e7d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48752f6513012a1b078da08b145d5c40a644f058
+refs/heads/master: 9c717758c9289331e22c88ef69d8c248def9cd29
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index c94e71781b79..4b0b7ed4a999 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -238,6 +238,7 @@ header-y += magic.h
 header-y += major.h
 header-y += map_to_7segment.h
 header-y += matroxfb.h
+header-y += mdio.h
 header-y += media.h
 header-y += mempolicy.h
 header-y += meye.h
diff --git a/trunk/include/linux/mdio.h b/trunk/include/linux/mdio.h
index b1494aced217..ec90da7232cc 100644
--- a/trunk/include/linux/mdio.h
+++ b/trunk/include/linux/mdio.h
@@ -273,6 +273,8 @@ static inline __u16 mdio_phy_id_c45(int prtad, int devad)
 	return MDIO_PHY_ID_C45 | (prtad << 5) | devad;
 }
 
+#ifdef __KERNEL__
+
 static inline bool mdio_phy_id_is_c45(int phy_id)
 {
 	return (phy_id & MDIO_PHY_ID_C45) && !(phy_id & ~MDIO_PHY_ID_C45_MASK);
@@ -288,11 +290,6 @@ static inline __u16 mdio_phy_id_devad(int phy_id)
 	return phy_id & MDIO_PHY_ID_DEVAD;
 }
 
-#define MDIO_SUPPORTS_C22		1
-#define MDIO_SUPPORTS_C45		2
-
-#ifdef __KERNEL__ 
-
 /**
  * struct mdio_if_info - Ethernet controller MDIO interface
  * @prtad: PRTAD of the PHY (%MDIO_PRTAD_NONE if not present/unknown)
@@ -321,6 +318,8 @@ struct mdio_if_info {
 
 #define MDIO_PRTAD_NONE			(-1)
 #define MDIO_DEVAD_NONE			(-1)
+#define MDIO_SUPPORTS_C22		1
+#define MDIO_SUPPORTS_C45		2
 #define MDIO_EMULATE_C22		4
 
 struct ethtool_cmd;