diff options
Diffstat (limited to 'drivers/net/3c503.c')
-rw-r--r-- | drivers/net/3c503.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c index 9c23336750e2..900b0ffdcc68 100644 --- a/drivers/net/3c503.c +++ b/drivers/net/3c503.c | |||
@@ -149,7 +149,7 @@ el2_pio_probe(struct net_device *dev) | |||
149 | #ifndef MODULE | 149 | #ifndef MODULE |
150 | struct net_device * __init el2_probe(int unit) | 150 | struct net_device * __init el2_probe(int unit) |
151 | { | 151 | { |
152 | struct net_device *dev = alloc_ei_netdev(); | 152 | struct net_device *dev = alloc_eip_netdev(); |
153 | int err; | 153 | int err; |
154 | 154 | ||
155 | if (!dev) | 155 | if (!dev) |
@@ -340,7 +340,7 @@ el2_probe1(struct net_device *dev, int ioaddr) | |||
340 | dev->stop = &el2_close; | 340 | dev->stop = &el2_close; |
341 | dev->ethtool_ops = &netdev_ethtool_ops; | 341 | dev->ethtool_ops = &netdev_ethtool_ops; |
342 | #ifdef CONFIG_NET_POLL_CONTROLLER | 342 | #ifdef CONFIG_NET_POLL_CONTROLLER |
343 | dev->poll_controller = ei_poll; | 343 | dev->poll_controller = eip_poll; |
344 | #endif | 344 | #endif |
345 | 345 | ||
346 | retval = register_netdev(dev); | 346 | retval = register_netdev(dev); |
@@ -386,7 +386,7 @@ el2_open(struct net_device *dev) | |||
386 | outb_p(0x00, E33G_IDCFR); | 386 | outb_p(0x00, E33G_IDCFR); |
387 | if (*irqp == probe_irq_off(cookie) /* It's a good IRQ line! */ | 387 | if (*irqp == probe_irq_off(cookie) /* It's a good IRQ line! */ |
388 | && ((retval = request_irq(dev->irq = *irqp, | 388 | && ((retval = request_irq(dev->irq = *irqp, |
389 | ei_interrupt, 0, dev->name, dev)) == 0)) | 389 | eip_interrupt, 0, dev->name, dev)) == 0)) |
390 | break; | 390 | break; |
391 | } | 391 | } |
392 | } while (*++irqp); | 392 | } while (*++irqp); |
@@ -395,13 +395,13 @@ el2_open(struct net_device *dev) | |||
395 | return retval; | 395 | return retval; |
396 | } | 396 | } |
397 | } else { | 397 | } else { |
398 | if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { | 398 | if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) { |
399 | return retval; | 399 | return retval; |
400 | } | 400 | } |
401 | } | 401 | } |
402 | 402 | ||
403 | el2_init_card(dev); | 403 | el2_init_card(dev); |
404 | ei_open(dev); | 404 | eip_open(dev); |
405 | return 0; | 405 | return 0; |
406 | } | 406 | } |
407 | 407 | ||
@@ -412,7 +412,7 @@ el2_close(struct net_device *dev) | |||
412 | dev->irq = ei_status.saved_irq; | 412 | dev->irq = ei_status.saved_irq; |
413 | outb(EGACFR_IRQOFF, E33G_GACFR); /* disable interrupts. */ | 413 | outb(EGACFR_IRQOFF, E33G_GACFR); /* disable interrupts. */ |
414 | 414 | ||
415 | ei_close(dev); | 415 | eip_close(dev); |
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
418 | 418 | ||
@@ -698,7 +698,7 @@ init_module(void) | |||
698 | if (this_dev != 0) break; /* only autoprobe 1st one */ | 698 | if (this_dev != 0) break; /* only autoprobe 1st one */ |
699 | printk(KERN_NOTICE "3c503.c: Presently autoprobing (not recommended) for a single card.\n"); | 699 | printk(KERN_NOTICE "3c503.c: Presently autoprobing (not recommended) for a single card.\n"); |
700 | } | 700 | } |
701 | dev = alloc_ei_netdev(); | 701 | dev = alloc_eip_netdev(); |
702 | if (!dev) | 702 | if (!dev) |
703 | break; | 703 | break; |
704 | dev->irq = irq[this_dev]; | 704 | dev->irq = irq[this_dev]; |