summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2016-05-16 20:52:42 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-17 20:31:08 +0200
commit7f32541c2fdaa84af418c3e1431bbd066ab44d09 (patch)
tree2013a181bb0d1dc7f0e2df42572f70f6620258d6 /drivers
parentMerge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel (diff)
downloadlinux-7f32541c2fdaa84af418c3e1431bbd066ab44d09.tar.xz
linux-7f32541c2fdaa84af418c3e1431bbd066ab44d09.zip
phy dp83867: Fix compilation with CONFIG_OF_MDIO=m
When CONFIG_OF_MDIO is configured as module, the #define for it really is CONFIG_OF_MDIO_MODULE, not CONFIG_OF_MDIO. So if we are compiling it as module, the dp83867 doesn't see that OF_MDIO was selected and doesn't read the dt rgmii parameters. The fix is simple: Use IS_ENABLED(). It checks for both - module as well as compiled in code. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/dp83867.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 2afa61b51d41..94cc278b3136 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -99,7 +99,7 @@ static int dp83867_config_intr(struct phy_device *phydev)
return phy_write(phydev, MII_DP83867_MICR, micr_status);
}
-#ifdef CONFIG_OF_MDIO
+#if IS_ENABLED(CONFIG_OF_MDIO)
static int dp83867_of_init(struct phy_device *phydev)
{
struct dp83867_private *dp83867 = phydev->priv;