git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
net
/
8390.c
diff --git
a/drivers/net/8390.c
b/drivers/net/8390.c
index
21153de
..
7c7518b
100644
(file)
--- a/
drivers/net/8390.c
+++ b/
drivers/net/8390.c
@@
-17,7
+17,7
@@
int ei_close(struct net_device *dev)
}
EXPORT_SYMBOL(ei_close);
-
in
t ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
+
netdev_tx_
t ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
return __ei_start_xmit(skb, dev);
}