[src/trunk]: src/sys/arch/evbarm/gumstix Conditionalize omap includes on OVERO

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/78b534f44b65
branches:  trunk
changeset: 783272:78b534f44b65
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Dec 12 19:47:44 2012 +0000

description:
Conditionalize omap includes on OVERO

diffstat:

 sys/arch/evbarm/gumstix/gumstix_machdep.c |  4 +++-
 sys/arch/evbarm/gumstix/gxio.c            |  6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 82f1959cb0f8 -r 78b534f44b65 sys/arch/evbarm/gumstix/gumstix_machdep.c
--- a/sys/arch/evbarm/gumstix/gumstix_machdep.c Wed Dec 12 18:58:05 2012 +0000
+++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c Wed Dec 12 19:47:44 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gumstix_machdep.c,v 1.44 2012/10/27 17:17:47 chs Exp $ */
+/*     $NetBSD: gumstix_machdep.c,v 1.45 2012/12/12 19:47:44 matt Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -171,11 +171,13 @@
 #include <machine/frame.h>
 
 #include <arm/arm32/machdep.h>
+#ifdef OVERO
 #include <arm/omap/omap2_gpmcreg.h>
 #include <arm/omap/omap2_prcm.h>
 #include <arm/omap/omap2_reg.h>
 #include <arm/omap/omap_var.h>
 #include <arm/omap/omap_com.h>
+#endif
 #include <arm/undefined.h>
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
diff -r 82f1959cb0f8 -r 78b534f44b65 sys/arch/evbarm/gumstix/gxio.c
--- a/sys/arch/evbarm/gumstix/gxio.c    Wed Dec 12 18:58:05 2012 +0000
+++ b/sys/arch/evbarm/gumstix/gxio.c    Wed Dec 12 19:47:44 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gxio.c,v 1.18 2010/09/23 06:43:32 kiyohara Exp $ */
+/*     $NetBSD: gxio.c,v 1.19 2012/12/12 19:47:44 matt Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.18 2010/09/23 06:43:32 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.19 2012/12/12 19:47:44 matt Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_gumstix.h"
@@ -49,12 +49,14 @@
 
 #include <machine/bootconfig.h>
 
+#if defined(OVERO)
 #include <arm/omap/omap2_gpmcreg.h>
 #include <arm/omap/omap2_reg.h>
 #if defined(OMAP3530)
 #include <arm/omap/omap2_intr.h>
 #endif
 #include <arm/omap/omap_var.h>
+#endif
 #if defined(CPU_XSCALE_PXA270) || defined(CPU_XSCALE_PXA250)
 #include <arm/xscale/pxa2x0cpu.h>
 #endif