kernel: replace bgmac patches for BCM47094 with final ones

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 48756
This commit is contained in:
Rafał Miłecki
2016-02-24 22:43:43 +00:00
parent 319863f60e
commit 9e9617a864
5 changed files with 57 additions and 41 deletions

View File

@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <linux/bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
@@ -1545,6 +1546,17 @@ static void bgmac_mii_unregister(struct
@@ -1544,6 +1545,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
**************************************************/
@@ -1687,6 +1699,14 @@ static int bgmac_probe(struct bcma_devic
@@ -1686,6 +1698,14 @@ static int bgmac_probe(struct bcma_devic
net_dev->hw_features = net_dev->features;
net_dev->vlan_features = net_dev->features;
@@ -45,7 +45,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");
@@ -1713,6 +1733,10 @@ static void bgmac_remove(struct bcma_dev
@@ -1712,6 +1732,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);