Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm/gumstix Fix build fail.



details:   https://anonhg.NetBSD.org/src/rev/6a5f3935c816
branches:  trunk
changeset: 757410:6a5f3935c816
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sat Aug 28 07:13:47 2010 +0000

description:
Fix build fail.
  + Include opt_omap.h, if defined OVERO.
  + Fix the pair of parentheses.

diffstat:

 sys/arch/evbarm/gumstix/gumstix_machdep.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 5d2a60a49625 -r 6a5f3935c816 sys/arch/evbarm/gumstix/gumstix_machdep.c
--- a/sys/arch/evbarm/gumstix/gumstix_machdep.c Sat Aug 28 07:06:29 2010 +0000
+++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c Sat Aug 28 07:13:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gumstix_machdep.c,v 1.30 2010/08/28 04:46:24 kiyohara Exp $ */
+/*     $NetBSD: gumstix_machdep.c,v 1.31 2010/08/28 07:13:47 kiyohara Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -139,8 +139,10 @@
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_cputypes.h"
+#include "opt_gumstix.h"
+#ifdef OVERO
 #include "opt_omap.h"
-#include "opt_gumstix.h"
+#endif
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
@@ -1117,7 +1119,7 @@
                if ((p = strstr(bootargs, expansion_name)))
                        q = p + strlen(expansion_name);
 #ifdef GUMSTIX_NETBSD_ARGS_BUSHEADER
-               else if (p = strstr(bootargs, busheader_name))
+               else if ((p = strstr(bootargs, busheader_name)))
                        q = p + strlen(busheader_name);
 #endif
                if (p) {



Home | Main Index | Thread Index | Old Index