From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 12 Aug 2013 18:45:06 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc1~132^2~297^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=89c2af3c14ddf8ae48637a7b454d66ac5e0ca728;p=~andy%2Flinux

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
---

89c2af3c14ddf8ae48637a7b454d66ac5e0ca728
diff --cc drivers/net/ethernet/broadcom/Kconfig
index 52c96036dcc,7b839bf5bb7..2fa5b86f139
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@@ -130,8 -130,7 +130,8 @@@ config BNX2X_SRIO
  
  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.
  	  They can be found on BCM47xx SoCs and provide gigabit ethernet.