diff options
author | 2009-09-14 20:26:05 +0200 | |
---|---|---|
committer | 2009-09-14 20:26:05 +0200 | |
commit | ac8d513a6801c8636922ccf4f30211810c9a56ce (patch) | |
tree | 83ba584487a6a612c8fcf2563c28c0263df35ba2 /drivers/net/8390p.c | |
parent | Merge branch 'master' into for-linus (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 (diff) | |
download | linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.gz linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.bz2 linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.zip |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/8390p.c')
-rw-r--r-- | drivers/net/8390p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8390p.c b/drivers/net/8390p.c index d225c291fd93..a2a64ea0b691 100644 --- a/drivers/net/8390p.c +++ b/drivers/net/8390p.c @@ -22,7 +22,7 @@ int eip_close(struct net_device *dev) } EXPORT_SYMBOL(eip_close); -int eip_start_xmit(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t eip_start_xmit(struct sk_buff *skb, struct net_device *dev) { return __ei_start_xmit(skb, dev); } |