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
/
jazzsonic.c
diff --git
a/drivers/net/jazzsonic.c
b/drivers/net/jazzsonic.c
index
20f757c
..
8624bfc
100644
(file)
--- a/
drivers/net/jazzsonic.c
+++ b/
drivers/net/jazzsonic.c
@@
-37,6
+37,8
@@
#include <asm/jazz.h>
#include <asm/jazzdma.h>
#include <asm/jazz.h>
#include <asm/jazzdma.h>
+#define DRV_NAME "jazzsonic"
+
#define SREGS_PAD(n) u16 n;
#include "sonic.h"
#define SREGS_PAD(n) u16 n;
#include "sonic.h"
@@
-151,7
+153,7
@@
static int __init sonic_probe1(struct net_device *dev, unsigned int base_addr,
int err = -ENODEV;
int i;
int err = -ENODEV;
int i;
- if (!request_region(base_addr, 0x100,
dev->name
))
+ if (!request_region(base_addr, 0x100,
DRV_NAME
))
return -EBUSY;
/*
* get the Silicon Revision ID. If this is one of the known
return -EBUSY;
/*
* get the Silicon Revision ID. If this is one of the known