---

yaml --- r: 5970 b: refs/heads/master c: 530d8e9 h: refs/heads/master v: v3
git-mirror · Aug 24, 2005 · e3fde55 · e3fde55
1 parent a68e1c6
commit e3fde55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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