diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-01 14:38:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-01 14:38:59 -0400 |
| commit | ce2a04c15f4b943015aab0c7476cb1460654e914 (patch) | |
| tree | 160bc8bb98d4211393230dcfbc6440359c00ecd0 /include/linux/stmmac.h | |
| parent | c66e98c9532bf7b58fe78cc59fb37d3ff651756d (diff) | |
| parent | a7657f128c279ae5796ab2ca7d04a7819f4259f0 (diff) | |
| download | linux-stericsson-ce2a04c15f4b943015aab0c7476cb1460654e914.tar.gz | |
Merge branch 'stmmac-fixes'
Giuseppe Cavallaro says:
====================
stmmac MDIO and normal descr fixes
This patch series is to fix the problems below and recently debugged
in this mailing list:
o to fix a problem for the HW where the normal descriptor
o to fix the mdio registration according to the different
platform configurations
I am resending all the patches again: built on top of net.git repo.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/stmmac.h')
| -rw-r--r-- | include/linux/stmmac.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 4bcf5a61aada..e6bc30a42a74 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -108,7 +108,6 @@ struct stmmac_axi { }; struct plat_stmmacenet_data { - char *phy_bus_name; int bus_id; int phy_addr; int interface; |