[PATCH] bgmac: make bgmac depend on bcm47xx

[PATCH] bgmac: make bgmac depend on bcm47xx

[Hauke Mehrtens]

bgmac uses bcm47xx_nvram.h which is only available when BCM47XX was
selected. Earlier BCMA_HOST_SOC depended on BCM47XX so this was not
build on any other archs, but that changed. We should modify this
driver to get access to the nvram or the variables through platform
data.

This fixes a build problem in linux-next reported by Stephen Rothwell:

drivers/net/ethernet/broadcom/bgmac.c:19:27: fatal error: bcm47xx_nvram.h: No such file or directory
 #include <bcm47xx_nvram.h>
                           ^

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/broadcom/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 52c9603..2fa5b86 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.
-- 
1.7.10.4

Re: [PATCH] bgmac: make bgmac depend on bcm47xx

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 910 bytes --]

Hi,

On Tue, 23 Jul 2013 23:28:49 +0200 Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> bgmac uses bcm47xx_nvram.h which is only available when BCM47XX was
> selected. Earlier BCMA_HOST_SOC depended on BCM47XX so this was not
> build on any other archs, but that changed. We should modify this
> driver to get access to the nvram or the variables through platform
> data.
> 
> This fixes a build problem in linux-next reported by Stephen Rothwell:
> 
> drivers/net/ethernet/broadcom/bgmac.c:19:27: fatal error: bcm47xx_nvram.h: No such file or directory
>  #include <bcm47xx_nvram.h>
>                            ^
> 
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

This patch really needs to go to John as the patch that exposes the
breakage is in his tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] bgmac: make bgmac depend on bcm47xx

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]

Hi,

On Wed, 24 Jul 2013 11:08:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 23 Jul 2013 23:28:49 +0200 Hauke Mehrtens <hauke@hauke-m.de> wrote:
> >
> > bgmac uses bcm47xx_nvram.h which is only available when BCM47XX was
> > selected. Earlier BCMA_HOST_SOC depended on BCM47XX so this was not
> > build on any other archs, but that changed. We should modify this
> > driver to get access to the nvram or the variables through platform
> > data.
> > 
> > This fixes a build problem in linux-next reported by Stephen Rothwell:
> > 
> > drivers/net/ethernet/broadcom/bgmac.c:19:27: fatal error: bcm47xx_nvram.h: No such file or directory
> >  #include <bcm47xx_nvram.h>
> >                            ^
> > 
> > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> This patch really needs to go to John as the patch that exposes the
> breakage is in his tree.

I applied this to the wireless-next tree merge today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] bgmac: make bgmac depend on bcm47xx

[John W. Linville]

On Wed, Jul 24, 2013 at 11:08:58AM +1000, Stephen Rothwell wrote:
> Hi,
> 
> On Tue, 23 Jul 2013 23:28:49 +0200 Hauke Mehrtens <hauke@hauke-m.de> wrote:
> >
> > bgmac uses bcm47xx_nvram.h which is only available when BCM47XX was
> > selected. Earlier BCMA_HOST_SOC depended on BCM47XX so this was not
> > build on any other archs, but that changed. We should modify this
> > driver to get access to the nvram or the variables through platform
> > data.
> > 
> > This fixes a build problem in linux-next reported by Stephen Rothwell:
> > 
> > drivers/net/ethernet/broadcom/bgmac.c:19:27: fatal error: bcm47xx_nvram.h: No such file or directory
> >  #include <bcm47xx_nvram.h>
> >                            ^
> > 
> > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> This patch really needs to go to John as the patch that exposes the
> breakage is in his tree.

I'll merge this one -- OK, Dave?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH] bgmac: make bgmac depend on bcm47xx

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 24 Jul 2013 09:54:12 -0400

> On Wed, Jul 24, 2013 at 11:08:58AM +1000, Stephen Rothwell wrote:
>> Hi,
>> 
>> On Tue, 23 Jul 2013 23:28:49 +0200 Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> >
>> > bgmac uses bcm47xx_nvram.h which is only available when BCM47XX was
>> > selected. Earlier BCMA_HOST_SOC depended on BCM47XX so this was not
>> > build on any other archs, but that changed. We should modify this
>> > driver to get access to the nvram or the variables through platform
>> > data.
>> > 
>> > This fixes a build problem in linux-next reported by Stephen Rothwell:
>> > 
>> > drivers/net/ethernet/broadcom/bgmac.c:19:27: fatal error: bcm47xx_nvram.h: No such file or directory
>> >  #include <bcm47xx_nvram.h>
>> >                            ^
>> > 
>> > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> 
>> This patch really needs to go to John as the patch that exposes the
>> breakage is in his tree.
> 
> I'll merge this one -- OK, Dave?

No problem.