Skip to content

Commit

Permalink
Merge branch 'bcm-OF-deps'
Browse files Browse the repository at this point in the history
Florian Fainelli says:

====================
net: Drop OF dependency for some Broadcom drivers

This patch series drops the CONFIG_OF dependency that some Broadcom drivers
had, this is no longer necessary and goes against allowing build testing
on more platforms.

Let me know if kbuild or your own builds somehow fail.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 18, 2018
2 parents d81d25e + 9aee398 commit 0725345
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/dsa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "drivers/net/dsa/b53/Kconfig"

config NET_DSA_BCM_SF2
tristate "Broadcom Starfighter 2 Ethernet switch support"
depends on HAS_IOMEM && NET_DSA && OF_MDIO
depends on HAS_IOMEM && NET_DSA
select NET_DSA_TAG_BRCM
select FIXED_PHY
select BCM7XXX_PHY
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/broadcom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ config BCM63XX_ENET

config BCMGENET
tristate "Broadcom GENET internal MAC support"
depends on OF && HAS_IOMEM
depends on HAS_IOMEM
select MII
select PHYLIB
select FIXED_PHY
Expand Down Expand Up @@ -181,7 +181,7 @@ config BGMAC_PLATFORM

config SYSTEMPORT
tristate "Broadcom SYSTEMPORT internal MAC support"
depends on OF
depends on HAS_IOMEM
depends on NET_DSA || !NET_DSA
select MII
select PHYLIB
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/phy/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ config MDIO_BCM_IPROC

config MDIO_BCM_UNIMAC
tristate "Broadcom UniMAC MDIO bus controller"
depends on HAS_IOMEM && OF_MDIO
depends on HAS_IOMEM
help
This module provides a driver for the Broadcom UniMAC MDIO busses.
This hardware can be found in the Broadcom GENET Ethernet MAC
Expand Down

0 comments on commit 0725345

Please sign in to comment.