diff options
Diffstat (limited to 'drivers/net/ne.c')
-rw-r--r-- | drivers/net/ne.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 874d291cbae..14126973bd1 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
@@ -217,7 +217,7 @@ static int __init do_ne_probe(struct net_device *dev) | |||
217 | #ifndef MODULE | 217 | #ifndef MODULE |
218 | struct net_device * __init ne_probe(int unit) | 218 | struct net_device * __init ne_probe(int unit) |
219 | { | 219 | { |
220 | struct net_device *dev = alloc_ei_netdev(); | 220 | struct net_device *dev = alloc_eip_netdev(); |
221 | int err; | 221 | int err; |
222 | 222 | ||
223 | if (!dev) | 223 | if (!dev) |
@@ -490,7 +490,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) | |||
490 | 490 | ||
491 | /* Snarf the interrupt now. There's no point in waiting since we cannot | 491 | /* Snarf the interrupt now. There's no point in waiting since we cannot |
492 | share and the board will usually be enabled. */ | 492 | share and the board will usually be enabled. */ |
493 | ret = request_irq(dev->irq, ei_interrupt, 0, name, dev); | 493 | ret = request_irq(dev->irq, eip_interrupt, 0, name, dev); |
494 | if (ret) { | 494 | if (ret) { |
495 | printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret); | 495 | printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret); |
496 | goto err_out; | 496 | goto err_out; |
@@ -534,7 +534,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) | |||
534 | dev->open = &ne_open; | 534 | dev->open = &ne_open; |
535 | dev->stop = &ne_close; | 535 | dev->stop = &ne_close; |
536 | #ifdef CONFIG_NET_POLL_CONTROLLER | 536 | #ifdef CONFIG_NET_POLL_CONTROLLER |
537 | dev->poll_controller = ei_poll; | 537 | dev->poll_controller = eip_poll; |
538 | #endif | 538 | #endif |
539 | NS8390_init(dev, 0); | 539 | NS8390_init(dev, 0); |
540 | 540 | ||
@@ -554,7 +554,7 @@ err_out: | |||
554 | 554 | ||
555 | static int ne_open(struct net_device *dev) | 555 | static int ne_open(struct net_device *dev) |
556 | { | 556 | { |
557 | ei_open(dev); | 557 | eip_open(dev); |
558 | return 0; | 558 | return 0; |
559 | } | 559 | } |
560 | 560 | ||
@@ -562,7 +562,7 @@ static int ne_close(struct net_device *dev) | |||
562 | { | 562 | { |
563 | if (ei_debug > 1) | 563 | if (ei_debug > 1) |
564 | printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); | 564 | printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); |
565 | ei_close(dev); | 565 | eip_close(dev); |
566 | return 0; | 566 | return 0; |
567 | } | 567 | } |
568 | 568 | ||
@@ -814,7 +814,7 @@ static int __init ne_drv_probe(struct platform_device *pdev) | |||
814 | if (!res || irq < 0) | 814 | if (!res || irq < 0) |
815 | return -ENODEV; | 815 | return -ENODEV; |
816 | 816 | ||
817 | dev = alloc_ei_netdev(); | 817 | dev = alloc_eip_netdev(); |
818 | if (!dev) | 818 | if (!dev) |
819 | return -ENOMEM; | 819 | return -ENOMEM; |
820 | dev->irq = irq; | 820 | dev->irq = irq; |
@@ -912,7 +912,7 @@ int __init init_module(void) | |||
912 | int plat_found = !ne_init(); | 912 | int plat_found = !ne_init(); |
913 | 913 | ||
914 | for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { | 914 | for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { |
915 | struct net_device *dev = alloc_ei_netdev(); | 915 | struct net_device *dev = alloc_eip_netdev(); |
916 | if (!dev) | 916 | if (!dev) |
917 | break; | 917 | break; |
918 | dev->irq = irq[this_dev]; | 918 | dev->irq = irq[this_dev]; |