Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Stephen Hemminger
and committed by
Linus Torvalds
49f276be
e95926d0
+4
-4
+4
-4
drivers/net/hp-plus.c
+4
-4
drivers/net/hp-plus.c
···
139
139
#ifndef MODULE
140
140
struct net_device * __init hp_plus_probe(int unit)
141
141
{
142
-
struct net_device *dev = alloc_ei_netdev();
142
+
struct net_device *dev = alloc_eip_netdev();
143
143
int err;
144
144
145
145
if (!dev)
···
284
284
int option_reg;
285
285
int retval;
286
286
287
-
if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
287
+
if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) {
288
288
return retval;
289
289
}
290
290
···
302
302
/* Select the operational page. */
303
303
outw(Perf_Page, ioaddr + HP_PAGING);
304
304
305
-
ei_open(dev);
305
+
eip_open(dev);
306
306
return 0;
307
307
}
308
308
···
313
313
int option_reg = inw(ioaddr + HPP_OPTION);
314
314
315
315
free_irq(dev->irq, dev);
316
-
ei_close(dev);
316
+
eip_close(dev);
317
317
outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset,
318
318
ioaddr + HPP_OPTION);
319
319