Messages in this thread Patch in this message | | | Date | Thu, 5 Apr 2012 13:25:15 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the final tree (net-next tree related) |
| |
Hi all,
After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this:
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: In function 'stmmac_probe_config_dt': drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:53:7: error: 'struct plat_stmmacenet_data' has no member named 'pbl'
Caused by commit 8327eb65e795 ("stmmac: re-work the internal GMAC DMA platf parameters"). Clearly I am missing something, because I can't see how that patch is correct since nothing ever assigns to the new dma_cfg pointer but it is dereferenced.
I have added this patch to make it build today, but it is obviously not correct.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 5 Apr 2012 13:19:21 +1000 Subject: [PATCH] stmmac: hack to make it build
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 116529a..1e4d12d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -50,7 +50,7 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev, * once needed on other platforms. */ if (of_device_is_compatible(np, "st,spear600-gmac")) { - plat->pbl = 8; +/* plat->pbl = 8; */ plat->has_gmac = 1; plat->pmt = 1; } -- 1.7.10.rc3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |