diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-16 11:34:41 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-16 11:34:41 +0200 |
commit | 86b9eb2105578eaecba52ca419c8670a51b70e99 (patch) | |
tree | a90d0574b4fee0842e51e42d5647bbc398102e4e /fs | |
parent | 239a8523369472c4c6bb9a0649f2eb5977121dbe (diff) | |
parent | abe4560c8add1c58a944b36e8ea51b10968f4d7b (diff) | |
download | barebox-86b9eb2105578eaecba52ca419c8670a51b70e99.tar.gz barebox-86b9eb2105578eaecba52ca419c8670a51b70e99.tar.xz |
Merge branch 'work/dns' into next
Diffstat (limited to 'fs')
-rw-r--r-- | fs/tftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -603,7 +603,7 @@ static int tftp_probe(struct device_d *dev) dev->priv = priv; - string_to_ip(fsdev->backingstore, &priv->server); + priv->server = resolv(fsdev->backingstore); return 0; } |