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
/
defxx.c
diff --git
a/drivers/net/defxx.c
b/drivers/net/defxx.c
index
cada0c6
..
9ef9f39
100644
(file)
--- a/
drivers/net/defxx.c
+++ b/
drivers/net/defxx.c
@@
-219,6
+219,8
@@
static char version[] __devinitdata =
"defxx.c:v1.06 2003/08/04 Lawrence V. Stefani and others\n";
static char version[] __devinitdata =
"defxx.c:v1.06 2003/08/04 Lawrence V. Stefani and others\n";
+#define DRV_NAME "defxx"
+
#define DYNAMIC_BUFFERS 1
#define SKBUFF_RX_COPYBREAK 200
#define DYNAMIC_BUFFERS 1
#define SKBUFF_RX_COPYBREAK 200
@@
-435,9
+437,9
@@
static int __devinit dfx_init_one_pci_or_eisa(struct pci_dev *pdev, long ioaddr)
bp = dev->priv;
bp = dev->priv;
- if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN,
dev->name
)) {
+ if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN,
DRV_NAME
)) {
printk (KERN_ERR "%s: Cannot reserve I/O resource 0x%x @ 0x%lx, aborting\n",
printk (KERN_ERR "%s: Cannot reserve I/O resource 0x%x @ 0x%lx, aborting\n",
-
dev->name
, PFI_K_CSR_IO_LEN, ioaddr);
+
DRV_NAME
, PFI_K_CSR_IO_LEN, ioaddr);
err = -EBUSY;
goto err_out;
}
err = -EBUSY;
goto err_out;
}