Module Name: src
Committed By: kiyohara
Date: Sat Aug 28 07:13:47 UTC 2010
Modified Files:
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
Log Message:
Fix build fail.
+ Include opt_omap.h, if defined OVERO.
+ Fix the pair of parentheses.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.30 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.31
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.30 Sat Aug 28 04:46:24 2010
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Sat Aug 28 07:13:47 2010
@@ -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_omap.h"
#include "opt_gumstix.h"
+#ifdef OVERO
+#include "opt_omap.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) {
