diff options
Diffstat (limited to 'drivers/net/hp.c')
| -rw-r--r-- | drivers/net/hp.c | 14 |
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) | |||
| 103 | #ifndef MODULE | 103 | #ifndef MODULE |
| 104 | struct net_device * __init hp_probe(int unit) | 104 | struct net_device * __init hp_probe(int unit) |
| 105 | { | 105 | { |
| 106 | struct net_device *dev = alloc_ei_netdev(); | 106 | struct net_device *dev = alloc_eip_netdev(); |
| 107 | int err; | 107 | int err; |
| 108 | 108 | ||
| 109 | if (!dev) | 109 | if (!dev) |
| @@ -176,7 +176,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
| 176 | outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE); | 176 | outb_p(irqmap[irq] | HP_RUN, ioaddr + HP_CONFIGURE); |
| 177 | outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE); | 177 | outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE); |
| 178 | if (irq == probe_irq_off(cookie) /* It's a good IRQ line! */ | 178 | if (irq == probe_irq_off(cookie) /* It's a good IRQ line! */ |
| 179 | && request_irq (irq, ei_interrupt, 0, DRV_NAME, dev) == 0) { | 179 | && request_irq (irq, eip_interrupt, 0, DRV_NAME, dev) == 0) { |
| 180 | printk(" selecting IRQ %d.\n", irq); | 180 | printk(" selecting IRQ %d.\n", irq); |
| 181 | dev->irq = *irqp; | 181 | dev->irq = *irqp; |
| 182 | break; | 182 | break; |
| @@ -191,7 +191,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
| 191 | } else { | 191 | } else { |
| 192 | if (dev->irq == 2) | 192 | if (dev->irq == 2) |
| 193 | dev->irq = 9; | 193 | dev->irq = 9; |
| 194 | if ((retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev))) { | 194 | if ((retval = request_irq(dev->irq, eip_interrupt, 0, DRV_NAME, dev))) { |
| 195 | printk (" unable to get IRQ %d.\n", dev->irq); | 195 | printk (" unable to get IRQ %d.\n", dev->irq); |
| 196 | goto out; | 196 | goto out; |
| 197 | } | 197 | } |
| @@ -202,7 +202,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
| 202 | dev->open = &hp_open; | 202 | dev->open = &hp_open; |
| 203 | dev->stop = &hp_close; | 203 | dev->stop = &hp_close; |
| 204 | #ifdef CONFIG_NET_POLL_CONTROLLER | 204 | #ifdef CONFIG_NET_POLL_CONTROLLER |
| 205 | dev->poll_controller = ei_poll; | 205 | dev->poll_controller = eip_poll; |
| 206 | #endif | 206 | #endif |
| 207 | 207 | ||
| 208 | ei_status.name = name; | 208 | ei_status.name = name; |
| @@ -231,14 +231,14 @@ out: | |||
| 231 | static int | 231 | static int |
| 232 | hp_open(struct net_device *dev) | 232 | hp_open(struct net_device *dev) |
| 233 | { | 233 | { |
| 234 | ei_open(dev); | 234 | eip_open(dev); |
| 235 | return 0; | 235 | return 0; |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | static int | 238 | static int |
| 239 | hp_close(struct net_device *dev) | 239 | hp_close(struct net_device *dev) |
| 240 | { | 240 | { |
| 241 | ei_close(dev); | 241 | eip_close(dev); |
| 242 | return 0; | 242 | return 0; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| @@ -421,7 +421,7 @@ init_module(void) | |||
| 421 | if (this_dev != 0) break; /* only autoprobe 1st one */ | 421 | if (this_dev != 0) break; /* only autoprobe 1st one */ |
| 422 | printk(KERN_NOTICE "hp.c: Presently autoprobing (not recommended) for a single card.\n"); | 422 | printk(KERN_NOTICE "hp.c: Presently autoprobing (not recommended) for a single card.\n"); |
| 423 | } | 423 | } |
| 424 | dev = alloc_ei_netdev(); | 424 | dev = alloc_eip_netdev(); |
| 425 | if (!dev) | 425 | if (!dev) |
| 426 | break; | 426 | break; |
| 427 | dev->irq = irq[this_dev]; | 427 | dev->irq = irq[this_dev]; |
