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
/
ni52.c
diff --git
a/drivers/net/ni52.c
b/drivers/net/ni52.c
index
714d970
..
234709d
100644
(file)
--- a/
drivers/net/ni52.c
+++ b/
drivers/net/ni52.c
@@
-124,6
+124,8
@@
static int fifo=0x8; /* don't change */
#include "ni52.h"
#include "ni52.h"
+#define DRV_NAME "ni52"
+
#define DEBUG /* debug on */
#define SYSBUSVAL 1 /* 8 Bit */
#define DEBUG /* debug on */
#define SYSBUSVAL 1 /* 8 Bit */
@@
-424,7
+426,7
@@
static int __init ni52_probe1(struct net_device *dev,int ioaddr)
dev->mem_start = memstart;
dev->mem_end = memend;
dev->mem_start = memstart;
dev->mem_end = memend;
- if (!request_region(ioaddr, NI52_TOTAL_SIZE,
dev->name
))
+ if (!request_region(ioaddr, NI52_TOTAL_SIZE,
DRV_NAME
))
return -EBUSY;
if( !(inb(ioaddr+NI52_MAGIC1) == NI52_MAGICVAL1) ||
return -EBUSY;
if( !(inb(ioaddr+NI52_MAGIC1) == NI52_MAGICVAL1) ||