projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
drivers
/
net
/
wan
/
x25_asy.c
diff --git
a/drivers/net/wan/x25_asy.c
b/drivers/net/wan/x25_asy.c
index fa9fdfa128c1e6b732c74907fb43504c8ec2ad4c..5c47b011a9d7f3000a27d4c81d3dc75e5f855129 100644
(file)
--- a/
drivers/net/wan/x25_asy.c
+++ b/
drivers/net/wan/x25_asy.c
@@
-81,8
+81,8
@@
static struct x25_asy *x25_asy_alloc(void)
char name[IFNAMSIZ];
sprintf(name, "x25asy%d", i);
- dev = alloc_netdev(sizeof(struct x25_asy),
-
name
, x25_asy_setup);
+ dev = alloc_netdev(sizeof(struct x25_asy),
name,
+
NET_NAME_UNKNOWN
, x25_asy_setup);
if (!dev)
return NULL;