diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 10:33:36 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-12-19 10:33:36 +0100 |
| commit | 01956ef82685c0793214d0bd28889304c7ed9068 (patch) | |
| tree | 8d4ec514ba1c9e88cb0fd90871777d4917ff113f /drivers/net/ethernet/sun/sunbmac.c | |
| parent | 866ced99cbaa08b8dafdc0b0febf49cd6c3cf5a8 (diff) | |
| parent | fa8a03bec68d9ef89da72277bd3501ed3daa6217 (diff) | |
Merge branch 'github.com/Freescale/linux-fslc/4.14-2.0.x-imx' into toradex_4.14-2.0.x-imx-next
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'drivers/net/ethernet/sun/sunbmac.c')
| -rw-r--r-- | drivers/net/ethernet/sun/sunbmac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c index 3189722110c2..9a60fb2b4e9d 100644 --- a/drivers/net/ethernet/sun/sunbmac.c +++ b/drivers/net/ethernet/sun/sunbmac.c @@ -951,7 +951,8 @@ static void bigmac_tx_timeout(struct net_device *dev) } /* Put a packet on the wire. */ -static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t +bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct bigmac *bp = netdev_priv(dev); int len, entry; |