Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/dsa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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---

drivers/net/ethernet/broadcom/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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