Commit 49f276be authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Linus Torvalds

hpplus: fix build regression

This fixes kernel regression for 2.6.27-rc in
      http://bugzilla.kernel.org/show_bug.cgi?id=11547
The change to split 8390 into old isa and non-isa versions
overlooked this driver.
Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e95926d0
...@@ -139,7 +139,7 @@ static int __init do_hpp_probe(struct net_device *dev) ...@@ -139,7 +139,7 @@ static int __init do_hpp_probe(struct net_device *dev)
#ifndef MODULE #ifndef MODULE
struct net_device * __init hp_plus_probe(int unit) struct net_device * __init hp_plus_probe(int unit)
{ {
struct net_device *dev = alloc_ei_netdev(); struct net_device *dev = alloc_eip_netdev();
int err; int err;
if (!dev) if (!dev)
...@@ -284,7 +284,7 @@ hpp_open(struct net_device *dev) ...@@ -284,7 +284,7 @@ hpp_open(struct net_device *dev)
int option_reg; int option_reg;
int retval; int retval;
if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) {
return retval; return retval;
} }
...@@ -302,7 +302,7 @@ hpp_open(struct net_device *dev) ...@@ -302,7 +302,7 @@ hpp_open(struct net_device *dev)
/* Select the operational page. */ /* Select the operational page. */
outw(Perf_Page, ioaddr + HP_PAGING); outw(Perf_Page, ioaddr + HP_PAGING);
ei_open(dev); eip_open(dev);
return 0; return 0;
} }
...@@ -313,7 +313,7 @@ hpp_close(struct net_device *dev) ...@@ -313,7 +313,7 @@ hpp_close(struct net_device *dev)
int option_reg = inw(ioaddr + HPP_OPTION); int option_reg = inw(ioaddr + HPP_OPTION);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
ei_close(dev); eip_close(dev);
outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset, outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset,
ioaddr + HPP_OPTION); ioaddr + HPP_OPTION);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment