From: Al Viro <viro@www.linux.org.uk>
Date: Tue, 23 Aug 2005 21:47:42 +0000 (+0100)
Subject: [PATCH] emac netpoll fix
X-Git-Tag: v2.6.13-rc7~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=530d8e97384fd2a6805fa4515a4e6828d7b53ee2;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 6482d994d48..c7fb3675c09 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