Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / version.h

diff --git a/include/version.h b/include/version.h
index ec4e1f808d518e749352eb30b6888322aefd182c..c908bd30138f49258b29e73cda23b4b8cbd19fc8 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -27,7 +27,7 @@
 #include <timestamp.h>
 
 #ifndef DO_DEPS_ONLY
-#include "version_autogenerated.h"
+#include "generated/version_autogenerated.h"
 #endif
 
 #ifndef CONFIG_IDENT_STRING
@@ -37,6 +37,7 @@
 #define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
        U_BOOT_TIME ")" CONFIG_IDENT_STRING
 
+#ifndef __ASSEMBLY__
 extern const char version_string[];
-
+#endif /* __ASSEMBLY__ */
 #endif /* __VERSION_H__ */