linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/ethernet/broadcom/Kconfig between commit 31bd29776b85
("bgmac: add dependency to phylib") from Linus' tree and commit
72bb2f267887 ("bgmac: make bgmac depend on bcm47xx") from the
wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/broadcom/Kconfig
index 52c9603,7b839bf..0000000
--- 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.

Attachment: pgp00000.pgp
Description: PGP signature