projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
791cdc7
)
[PATCH] emac netpoll fix
author
Al Viro
<viro@www.linux.org.uk>
Tue, 23 Aug 2005 21:47:42 +0000
(22:47 +0100)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 24 Aug 2005 01:43:45 +0000
(18:43 -0700)
netpoll is void(struct net_device *), not int(struct net_device *)
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/net/ibm_emac/ibm_emac_core.c
patch
|
blob
|
history
diff --git
a/drivers/net/ibm_emac/ibm_emac_core.c
b/drivers/net/ibm_emac/ibm_emac_core.c
index 6482d994d4899aef539f2639bd70703c306d3c90..c7fb3675c09d29b010096854a326730368dd6b1c 100644
(file)
--- a/
drivers/net/ibm_emac/ibm_emac_core.c
+++ b/
drivers/net/ibm_emac/ibm_emac_core.c
@@
-1712,11
+1712,10
@@
struct mal_commac_ops emac_commac_ops = {
};
#ifdef CONFIG_NET_POLL_CONTROLLER
-static
int
emac_netpoll(struct net_device *ndev)
+static
void
emac_netpoll(struct net_device *ndev)
{
emac_rxeob_dev((void *)ndev, 0);
emac_txeob_dev((void *)ndev, 0);
- return 0;
}
#endif