projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: add BCM283x mini UART driver
[oweals/u-boot.git]
/
drivers
/
net
/
xilinx_ll_temac.c
diff --git
a/drivers/net/xilinx_ll_temac.c
b/drivers/net/xilinx_ll_temac.c
index dab78d073dab6185ec5445617185f794c437f5b9..ca09546ab59f7f7d4b540eb6903bdacaa9a55815 100644
(file)
--- a/
drivers/net/xilinx_ll_temac.c
+++ b/
drivers/net/xilinx_ll_temac.c
@@
-231,7
+231,7
@@
static int ll_temac_init(struct eth_device *dev, bd_t *bis)
struct ll_temac *ll_temac = dev->priv;
int ret;
struct ll_temac *ll_temac = dev->priv;
int ret;
- printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08
X
.\n",
+ printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08
lx
.\n",
dev->name, dev->index, dev->iobase);
if (!ll_temac_setup_ctrl(dev))
dev->name, dev->index, dev->iobase);
if (!ll_temac_setup_ctrl(dev))
@@
-303,7
+303,8
@@
int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
if (devinf->devname) {
strncpy(dev->name, devinf->devname, sizeof(dev->name));
} else {
if (devinf->devname) {
strncpy(dev->name, devinf->devname, sizeof(dev->name));
} else {
- snprintf(dev->name, sizeof(dev->name), "lltemac.%lx", devinf->base_addr);
+ snprintf(dev->name, sizeof(dev->name), "ll_tem.%lx",
+ devinf->base_addr);
devinf->devname = dev->name;
}
devinf->devname = dev->name;
}