aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2009-03-26 11:11:15 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-27 03:46:38 -0400
commit1ace90fe0a36ae9da0b2e1211e6a30ec244e9bd0 (patch)
treef63ce201c57abf780fb6ec8c4db9bdc748d49eb2
parent58add9fc02e7a9dbab9d80d5fa64f13972e91eb5 (diff)
3c503, smc-ultra: netdev_ops bugs
A couple of drivers have leftovers from netdev ops conversion. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/3c503.c3
-rw-r--r--drivers/net/smc-ultra.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 5b91a85fe107..4f08bd995836 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -353,9 +353,6 @@ el2_probe1(struct net_device *dev, int ioaddr)
353 353
354 dev->netdev_ops = &el2_netdev_ops; 354 dev->netdev_ops = &el2_netdev_ops;
355 dev->ethtool_ops = &netdev_ethtool_ops; 355 dev->ethtool_ops = &netdev_ethtool_ops;
356#ifdef CONFIG_NET_POLL_CONTROLLER
357 dev->poll_controller = eip_poll;
358#endif
359 356
360 retval = register_netdev(dev); 357 retval = register_netdev(dev);
361 if (retval) 358 if (retval)
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 2033fee3143a..f56f5e4083bd 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)
142 int base_addr = dev->base_addr; 142 int base_addr = dev->base_addr;
143 int irq = dev->irq; 143 int irq = dev->irq;
144 144
145#ifdef CONFIG_NET_POLL_CONTROLLER
146 dev->poll_controller = &ultra_poll;
147#endif
148 if (base_addr > 0x1ff) /* Check a single specified location. */ 145 if (base_addr > 0x1ff) /* Check a single specified location. */
149 return ultra_probe1(dev, base_addr); 146 return ultra_probe1(dev, base_addr);
150 else if (base_addr != 0) /* Don't probe at all. */ 147 else if (base_addr != 0) /* Don't probe at all. */