diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-08 23:11:28 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-08 23:11:28 +0300 |
| commit | 9a9a7a572709487acb0d2de83b375e8fbb4f9d91 (patch) | |
| tree | 672a24efe91c8221d9c246f97a209047f46b2bb7 /include | |
| parent | c502faf94153bd0fedc5389a936f728a659cc6ab (diff) | |
| parent | a6a3e026f0d358904afd3df6b7f952ed8ea5b942 (diff) | |
| download | linux-9a9a7a572709487acb0d2de83b375e8fbb4f9d91.tar.xz | |
Merge branch 'stmmac-cleanups'
Corentin Labbe says:
====================
net: stmmac: misc fix
I am currently working on dwmac-sun8i glue driver for Allwinner H3/A83T/A64.
This series is the result of all minor problem found in the stmmac driver.
All patch are tested on cubieboard2 via dwmac-sunxi and on pine64/orangepis via dwmac-sun8i.
Changes since v1:
- Removed netdev_dbg() in "net: stmmac: print phy information"
- Removed patch "net: stmmac: Implement NAPI for TX", it will be reworked
- Changed error message in "Correct the error message about invalid speed"
- Added some acked-by
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -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 d76033d6726d..fc273e9d5f67 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -134,7 +134,6 @@ struct plat_stmmacenet_data { int tx_fifo_size; int rx_fifo_size; void (*fix_mac_speed)(void *priv, unsigned int speed); - void (*bus_setup)(void __iomem *ioaddr); int (*init)(struct platform_device *pdev, void *priv); void (*exit)(struct platform_device *pdev, void *priv); void *bsp_priv; |