diff options
| author | Dan Murphy <dmurphy@ti.com> | 2020-06-05 09:01:06 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-24 17:50:40 +0200 |
| commit | 08cc0ec9ba86058879e896a5fa4c2bd26b1e1514 (patch) | |
| tree | 2d2c2a1b1184e70135ff94c725e01a9f24361b46 | |
| parent | fbaf0137df1e24dd4287d55321dfb73e110a7e54 (diff) | |
| download | linux-stable-08cc0ec9ba86058879e896a5fa4c2bd26b1e1514.tar.gz linux-stable-08cc0ec9ba86058879e896a5fa4c2bd26b1e1514.tar.bz2 linux-stable-08cc0ec9ba86058879e896a5fa4c2bd26b1e1514.zip | |
net: marvell: Fix OF_MDIO config check
[ Upstream commit 5cd119d9a05f1c1a08778a7305b4ca0f16bc1e20 ]
When CONFIG_OF_MDIO is set to be a module the code block is not
compiled. Use the IS_ENABLED macro that checks for both built in as
well as module.
Fixes: cf41a51db8985 ("of/phylib: Use device tree properties to initialize Marvell PHYs.")
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/phy/marvell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index a7796134e3be..91cf1d167263 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -358,7 +358,7 @@ static int m88e1101_config_aneg(struct phy_device *phydev) return marvell_config_aneg(phydev); } -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) /* Set and/or override some configuration registers based on the * marvell,reg-init property stored in the of_node for the phydev. * |