8390: Split 8390 support into a pausing and a non pausing driver core

Only a few ISA controllers need the pausing version of the 8390 core
while PCMCIA, later ISA and PCI do not. More importantly the ISA delays
can break non ISA boxes so we must use a different build of 8390.c for
the two sets of controllers.

No changes since last time as all the points of concerns raised proved to
be invalid

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index c649a8019beb..8281209ededf 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -103,7 +103,7 @@ static int __init do_hp_probe(struct net_device *dev)
 #ifndef MODULE
 struct net_device * __init hp_probe(int unit)
 {
-        struct net_device *dev = alloc_ei_netdev();
+        struct net_device *dev = alloc_eip_netdev();
         int err;
 
         if (!dev)
@@ -176,7 +176,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
                                 outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE);
                                 outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE);
                                 if (irq == probe_irq_off(cookie)                 /* It's a good IRQ line! */
-                                        && request_irq (irq, ei_interrupt, 0, DRV_NAME, dev) == 0) {
+                                        && request_irq (irq, eip_interrupt, 0, DRV_NAME, dev) == 0) {
                                         printk(" selecting IRQ %d.\n", irq);
                                         dev->irq = *irqp;
                                         break;
@@ -191,7 +191,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         } else {
                 if (dev->irq == 2)
                         dev->irq = 9;
-                if ((retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev))) {
+                if ((retval = request_irq(dev->irq, eip_interrupt, 0, DRV_NAME, dev))) {
                         printk (" unable to get IRQ %d.\n", dev->irq);
                         goto out;
                 }
@@ -202,7 +202,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         dev->open = &hp_open;
         dev->stop = &hp_close;
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = ei_poll;
+        dev->poll_controller = eip_poll;
 #endif
 
         ei_status.name = name;
@@ -231,14 +231,14 @@ out:
 static int
 hp_open(struct net_device *dev)
 {
-        ei_open(dev);
+        eip_open(dev);
         return 0;
 }
 
 static int
 hp_close(struct net_device *dev)
 {
-        ei_close(dev);
+        eip_close(dev);
         return 0;
 }
 
@@ -421,7 +421,7 @@ init_module(void)
                         if (this_dev != 0) break; /* only autoprobe 1st one */
                         printk(KERN_NOTICE "hp.c: Presently autoprobing (not recommended) for a single card.\n");
                 }
-                dev = alloc_ei_netdev();
+                dev = alloc_eip_netdev();
                 if (!dev)
                         break;
                 dev->irq = irq[this_dev];