From 215ca6c82b29c58263c348cf7b13e0c7b8a94b83 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 26 Mar 2009 15:11:31 +0000
Subject: [PATCH] --- yaml --- r: 136082 b: refs/heads/master c:
 06e884031702f06b32ce20750ab3c46c596dc776 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a6cdd7fd3fe6..e8da61caf0e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f352f9a1c8d53270970f4efcf5496cb9b01c4a8
+refs/heads/master: 06e884031702f06b32ce20750ab3c46c596dc776
diff --git a/trunk/drivers/net/smc-ultra.c b/trunk/drivers/net/smc-ultra.c
index f56f5e4083bd..0291ea098a06 100644
--- a/trunk/drivers/net/smc-ultra.c
+++ b/trunk/drivers/net/smc-ultra.c
@@ -196,7 +196,7 @@ static const struct net_device_ops ultra_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 	= ultra_poll,
 #endif
 };