Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master
diff --git a/Makefile b/Makefile
index a87311c..e74ff36 100644
--- a/Makefile
+++ b/Makefile
@@ -319,7 +319,7 @@
env:
$(MAKE) -C tools/env all || exit 1
-depend dep:
+depend dep: version
for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
tags ctags:
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 @@
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