From e3fde551d82dc3151693a81baea90f50ea010047 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@www.linux.org.uk>
Date: Tue, 23 Aug 2005 22:47:42 +0100
Subject: [PATCH] --- yaml --- r: 5970 b: refs/heads/master c:
 530d8e97384fd2a6805fa4515a4e6828d7b53ee2 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ibm_emac/ibm_emac_core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bcc9850106fd..6081d5cd0204 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 791cdc7c561e2e72596388533f959e6d74dc6231
+refs/heads/master: 530d8e97384fd2a6805fa4515a4e6828d7b53ee2
diff --git a/trunk/drivers/net/ibm_emac/ibm_emac_core.c b/trunk/drivers/net/ibm_emac/ibm_emac_core.c
index 6482d994d489..c7fb3675c09d 100644
--- a/trunk/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/trunk/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