Patchwork [U-Boot] linkstation: fix warning: "CONFIG_IDENT_STRING" redefined

login
register
mail settings
Submitter Wolfgang Denk
Date July 31, 2011, 10:35 a.m.
Message ID <1312108513-29786-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/107598/
State Accepted
Commit cb0090e804be552a75155a3596195077df3d6b69
Headers show

Comments

Wolfgang Denk - July 31, 2011, 10:35 a.m.
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>
---
 board/linkstation/linkstation.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Wolfgang Denk - Sept. 5, 2011, 7:43 a.m.
Dear Wolfgang Denk,

In message <1312108513-29786-1-git-send-email-wd@denx.de> you wrote:
> 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>
> ---
>  board/linkstation/linkstation.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

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>