git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
3c507.c
diff --git
a/drivers/net/3c507.c
b/drivers/net/3c507.c
index
bfd4ad0
..
ca0d71d
100644
(file)
--- a/
drivers/net/3c507.c
+++ b/
drivers/net/3c507.c
@@
-373,7
+373,7
@@
static int __init el16_probe1(struct net_device *dev, int ioaddr)
init_ID_done = 1;
}
init_ID_done = 1;
}
- if (!request_region(ioaddr, EL16_IO_EXTENT,
dev->name
))
+ if (!request_region(ioaddr, EL16_IO_EXTENT,
DRV_NAME
))
return -ENODEV;
if ((inb(ioaddr) != '*') || (inb(ioaddr + 1) != '3') ||
return -ENODEV;
if ((inb(ioaddr) != '*') || (inb(ioaddr + 1) != '3') ||
@@
-392,7
+392,7
@@
static int __init el16_probe1(struct net_device *dev, int ioaddr)
irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
- irqval = request_irq(irq, &el16_interrupt, 0,
dev->name
, dev);
+ irqval = request_irq(irq, &el16_interrupt, 0,
DRV_NAME
, dev);
if (irqval) {
printk ("unable to get IRQ %d (irqval=%d).\n", irq, irqval);
retval = -EAGAIN;
if (irqval) {
printk ("unable to get IRQ %d (irqval=%d).\n", irq, irqval);
retval = -EAGAIN;