summaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_emac
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-08-23 23:47:42 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-24 03:43:45 +0200
commit530d8e97384fd2a6805fa4515a4e6828d7b53ee2 (patch)
tree470585fbc61d736567f1963a00006de34eb350e5 /drivers/net/ibm_emac
parent[PATCH] vidc gcc4 fix (diff)
downloadlinux-530d8e97384fd2a6805fa4515a4e6828d7b53ee2.tar.xz
linux-530d8e97384fd2a6805fa4515a4e6828d7b53ee2.zip
[PATCH] emac netpoll fix
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>
Diffstat (limited to 'drivers/net/ibm_emac')
-rw-r--r--drivers/net/ibm_emac/ibm_emac_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 6482d994d489..c7fb3675c09d 100644
--- 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