diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2016-06-21 02:17:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-23 21:12:21 +0200 |
| commit | d1bd330a229fc8a69f0e7532138dfd42b4542fd4 (patch) | |
| tree | 9b6bba76bf8834b664bffcb92524d873dc574e42 | |
| parent | ti_cpsw: Check for disabled child nodes (diff) | |
| download | linux-d1bd330a229fc8a69f0e7532138dfd42b4542fd4.tar.xz linux-d1bd330a229fc8a69f0e7532138dfd42b4542fd4.zip | |
of_mdio: Enable fixed PHY support if driver is a module
The fixed_phy driver doesn't have to be built-in, and it's
important that of_mdio supports it even if it's a module.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/of/of_mdio.c | 2 | ||||
| -rw-r--r-- | include/linux/of_mdio.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index e051e1b57609..de68707a99c7 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -361,7 +361,7 @@ struct phy_device *of_phy_attach(struct net_device *dev, } EXPORT_SYMBOL(of_phy_attach); -#if defined(CONFIG_FIXED_PHY) +#if IS_ENABLED(CONFIG_FIXED_PHY) /* * of_phy_is_fixed_link() and of_phy_register_fixed_link() must * support two DT bindings: diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h index 8f2237eb3485..6c8cb9aa4c00 100644 --- a/include/linux/of_mdio.h +++ b/include/linux/of_mdio.h @@ -69,7 +69,7 @@ static inline int of_mdio_parse_addr(struct device *dev, } #endif /* CONFIG_OF */ -#if defined(CONFIG_OF) && defined(CONFIG_FIXED_PHY) +#if defined(CONFIG_OF) && IS_ENABLED(CONFIG_FIXED_PHY) extern int of_phy_register_fixed_link(struct device_node *np); extern bool of_phy_is_fixed_link(struct device_node *np); #else |