summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-12-16 14:30:09 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-16 15:02:23 -0500
commit6539c44d08ac2eea693b6163135169b9c8c18bb1 (patch)
tree1c879b16a0d4fd5f8b064b7beaa1f9dad516ded6 /include
parent772801ef7572f2b3e16bebceb707159ee3081ded (diff)
downloadlinux-6539c44d08ac2eea693b6163135169b9c8c18bb1.tar.bz2
net: Allow FIXED_PHY to be modular.
Otherwise we get things like: warning: (NET_DSA_BCM_SF2 && BCMGENET && SYSTEMPORT) selects FIXED_PHY which has unmet direct dependencies (NETDEVICES && PHYLIB=y) In order to make this work we have to rename fixed.c to fixed_phy.c because the regulator drivers already have a module named "fixed.o". Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/phy_fixed.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index f2ca1b459377..7e75bfe37cc7 100644
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -11,7 +11,7 @@ struct fixed_phy_status {
struct device_node;
-#ifdef CONFIG_FIXED_PHY
+#if IS_ENABLED(CONFIG_FIXED_PHY)
extern int fixed_phy_add(unsigned int irq, int phy_id,
struct fixed_phy_status *status);
extern struct phy_device *fixed_phy_register(unsigned int irq,