summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/broadcom/Kconfig
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-08-12 22:45:06 +0400
committerJohn W. Linville <linville@tuxdriver.com>2013-08-12 22:45:06 +0400
commit89c2af3c14ddf8ae48637a7b454d66ac5e0ca728 (patch)
tree77faf3fc889fb0e77ce7c4778f2bbc93fdf8cdd2 /drivers/net/ethernet/broadcom/Kconfig
parentf3dfd20860db3d0c400dd83a378176a28d3662db (diff)
parentd1e2586f484dfc36eee2b2d3a6c6c77be67ca492 (diff)
downloadlinux-89c2af3c14ddf8ae48637a7b454d66ac5e0ca728.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: drivers/net/ethernet/broadcom/Kconfig
Diffstat (limited to 'drivers/net/ethernet/broadcom/Kconfig')
-rw-r--r--drivers/net/ethernet/broadcom/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 52c96036dcc4..2fa5b86f139d 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -130,7 +130,7 @@ config BNX2X_SRIOV
config BGMAC
tristate "BCMA bus GBit core support"
- depends on BCMA_HOST_SOC && HAS_DMA
+ depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX
select PHYLIB
---help---
This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.