1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 2033fee3143a..0291ea098a06 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -142,9 +142,6 @@ static int __init do_ultra_probe(struct net_device *dev)
         int base_addr = dev->base_addr;
         int irq = dev->irq;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = &ultra_poll;
-#endif
         if (base_addr > 0x1ff)          /* Check a single specified location. */
                 return ultra_probe1(dev, base_addr);
         else if (base_addr != 0)        /* Don't probe at all. */
@@ -199,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
 };