From 7243a5ed8c34683b26b8e70174aa2e2def55aa2b Mon Sep 17 00:00:00 2001
From: Finn Thain <fthain@telegraphics.com.au>
Date: Thu, 28 May 2009 02:05:53 +0000
Subject: [PATCH] --- yaml --- r: 145446 b: refs/heads/master c:
 4e0168fa4842e27795a75b205a510f25b62181d9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e1fd4ad25f8d..1ddf85d21bca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22c8149313ee85c912e7b77a7afd04be8b8cba8
+refs/heads/master: 4e0168fa4842e27795a75b205a510f25b62181d9
diff --git a/trunk/drivers/net/mac8390.c b/trunk/drivers/net/mac8390.c
index f26667d5eaae..22e74a0e0361 100644
--- a/trunk/drivers/net/mac8390.c
+++ b/trunk/drivers/net/mac8390.c
@@ -489,7 +489,7 @@ static const struct net_device_ops mac8390_netdev_ops = {
 	.ndo_set_mac_address 	= eth_mac_addr,
 	.ndo_change_mtu		= eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	.ndo_poll_controller	= ei_poll,
+	.ndo_poll_controller	= __ei_poll,
 #endif
 };