Merge branch 'fixed_phy'

Florian Fainelli says:

====================
net: broadcom: fix FIXED_PHY dependencies

This patch series removes the bogus "select FIXED_PHY if FOO=y" that I have
been using in GENET, SYSTEMPORT and the SF2 DSA switch driver.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 7cf8f4ac281f..48e62a34f7f2 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -59,7 +59,7 @@ config NET_DSA_BCM_SF2
         depends on HAS_IOMEM
         select NET_DSA
         select NET_DSA_TAG_BRCM
-        select FIXED_PHY if NET_DSA_BCM_SF2=y
+        select FIXED_PHY
         select BCM7XXX_PHY
         select MDIO_BCM_UNIMAC
         ---help---
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 888247ad9068..41a3c9804427 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -64,7 +64,7 @@ config BCMGENET
         tristate "Broadcom GENET internal MAC support"
         select MII
         select PHYLIB
-        select FIXED_PHY if BCMGENET=y
+        select FIXED_PHY
         select BCM7XXX_PHY
         help
           This driver supports the built-in Ethernet MACs found in the
@@ -155,7 +155,7 @@ config SYSTEMPORT
         depends on OF
         select MII
         select PHYLIB
-        select FIXED_PHY if SYSTEMPORT=y
+        select FIXED_PHY
         help
           This driver supports the built-in Ethernet MACs found in the
           Broadcom BCM7xxx Set Top Box family chipset using an internal