Commit c286bbaf authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents d2cdcdf5 9f9f2647
...@@ -59,7 +59,7 @@ config NET_DSA_BCM_SF2 ...@@ -59,7 +59,7 @@ config NET_DSA_BCM_SF2
depends on HAS_IOMEM depends on HAS_IOMEM
select NET_DSA select NET_DSA
select NET_DSA_TAG_BRCM select NET_DSA_TAG_BRCM
select FIXED_PHY if NET_DSA_BCM_SF2=y select FIXED_PHY
select BCM7XXX_PHY select BCM7XXX_PHY
select MDIO_BCM_UNIMAC select MDIO_BCM_UNIMAC
---help--- ---help---
......
...@@ -64,7 +64,7 @@ config BCMGENET ...@@ -64,7 +64,7 @@ config BCMGENET
tristate "Broadcom GENET internal MAC support" tristate "Broadcom GENET internal MAC support"
select MII select MII
select PHYLIB select PHYLIB
select FIXED_PHY if BCMGENET=y select FIXED_PHY
select BCM7XXX_PHY select BCM7XXX_PHY
help help
This driver supports the built-in Ethernet MACs found in the This driver supports the built-in Ethernet MACs found in the
...@@ -155,7 +155,7 @@ config SYSTEMPORT ...@@ -155,7 +155,7 @@ config SYSTEMPORT
depends on OF depends on OF
select MII select MII
select PHYLIB select PHYLIB
select FIXED_PHY if SYSTEMPORT=y select FIXED_PHY
help help
This driver supports the built-in Ethernet MACs found in the This driver supports the built-in Ethernet MACs found in the
Broadcom BCM7xxx Set Top Box family chipset using an internal Broadcom BCM7xxx Set Top Box family chipset using an internal
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment