summaryrefslogtreecommitdiffstats
path: root/drivers/net/xilinx_ll_temac.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-27 15:05:12 -0500
committerTom Rini <trini@konsulko.com>2016-01-27 15:05:12 -0500
commit19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (patch)
tree8216f416e21cf71745abaec2c5a42ab9824b290e /drivers/net/xilinx_ll_temac.c
parentb20c38a973a51bf3f663bd298c63ad1b8e0de445 (diff)
parentf36919a8138ed7ecd3dbce4630e02936b13907da (diff)
downloadtalos-obmc-uboot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.tar.gz
talos-obmc-uboot-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers/net/xilinx_ll_temac.c')
-rw-r--r--drivers/net/xilinx_ll_temac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c
index 7cc86571e4..ca09546ab5 100644
--- a/drivers/net/xilinx_ll_temac.c
+++ b/drivers/net/xilinx_ll_temac.c
@@ -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 {
- 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;
}
OpenPOWER on IntegriCloud