git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
wan
/
dlci.c
diff --git
a/drivers/net/wan/dlci.c
b/drivers/net/wan/dlci.c
index
1481a44
..
21b104d
100644
(file)
--- a/
drivers/net/wan/dlci.c
+++ b/
drivers/net/wan/dlci.c
@@
-341,10
+341,6
@@
static int dlci_add(struct dlci_add *dlci)
}
}
- err = dev_alloc_name(master, master->name);
- if (err < 0)
- goto err2;
-
*(short *)(master->dev_addr) = dlci->dlci;
dlp = netdev_priv(master);