kernel: bgmac: update the driver patches to a version submitted for mainline kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 39201
This commit is contained in:
Hauke Mehrtens
2014-01-04 18:25:05 +00:00
parent 815ceabd9d
commit 5a55ace3b8
6 changed files with 120 additions and 67 deletions

View File

@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
@@ -1375,6 +1376,17 @@ static void bgmac_mii_unregister(struct
@@ -1381,6 +1382,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
@@ -1490,6 +1502,16 @@ static int bgmac_probe(struct bcma_devic
@@ -1507,6 +1519,16 @@ static int bgmac_probe(struct bcma_devic
goto err_dma_free;
}
@@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
err = register_netdev(bgmac->net_dev);
if (err) {
bgmac_err(bgmac, "Cannot register net device\n");
@@ -1519,6 +1541,10 @@ static void bgmac_remove(struct bcma_dev
@@ -1536,6 +1558,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);