summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-07-31 00:35:13 +0000
committerWolfgang Denk <wd@denx.de>2011-09-05 09:43:09 +0200
commitcb0090e804be552a75155a3596195077df3d6b69 (patch)
tree75bc381eccc00bca3c2fc27e6a9f9c559e1931a8 /board
parent712f4d1f34a0660f7562b84f272cbc8137da3fa4 (diff)
downloadu-boot-imx-cb0090e804be552a75155a3596195077df3d6b69.zip
u-boot-imx-cb0090e804be552a75155a3596195077df3d6b69.tar.gz
u-boot-imx-cb0090e804be552a75155a3596195077df3d6b69.tar.bz2
linkstation: fix warning: "CONFIG_IDENT_STRING" redefined
Commit 09c2e90 "unify version_string" defines a default value for CONFIG_IDENT_STRING in version.h, so any private settings musty be done before including this file. Move the include for version.h after the one for common.h to fix the build problem. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Diffstat (limited to 'board')
-rw-r--r--board/linkstation/linkstation.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/linkstation/linkstation.c b/board/linkstation/linkstation.c
index e564e50..7640856 100644
--- a/board/linkstation/linkstation.c
+++ b/board/linkstation/linkstation.c
@@ -21,8 +21,8 @@
* MA 02111-1307 USA
*/
-#include <version.h>
#include <common.h>
+#include <version.h>
#include <mpc824x.h>
#include <asm/io.h>
#include <ns16550.h>