diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2007-09-24 14:43:43 -0500 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2007-09-24 14:43:43 -0500 |
commit | 8ffc774993725a0646aa8d1995d968c95aee9e3c (patch) | |
tree | ee69b8872cf8c295a48244280c82d98e191111ab /net/bootp.c | |
parent | d7fee32b7e61fe11c64e371cde79faa4768e8350 (diff) | |
parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
download | u-boot-imx-8ffc774993725a0646aa8d1995d968c95aee9e3c.zip u-boot-imx-8ffc774993725a0646aa8d1995d968c95aee9e3c.tar.gz u-boot-imx-8ffc774993725a0646aa8d1995d968c95aee9e3c.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'net/bootp.c')
-rw-r--r-- | net/bootp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c index be1ee33..749d3e5 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -730,7 +730,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) case 2: /* Time offset */ - NetCopyLong (&NetTimeOffset, (ulong *) (popt + 2)); + NetCopyLong ((ulong *)&NetTimeOffset, (ulong *) (popt + 2)); NetTimeOffset = ntohl (NetTimeOffset); break; #endif |