Module Name: src
Committed By: matt
Date: Wed Dec 12 19:47:45 UTC 2012
Modified Files:
src/sys/arch/evbarm/gumstix: gumstix_machdep.c gxio.c
Log Message:
Conditionalize omap includes on OVERO
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/gumstix/gxio.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.44 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.45
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.44 Sat Oct 27 17:17:47 2012
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Wed Dec 12 19:47:44 2012
@@ -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>
Index: src/sys/arch/evbarm/gumstix/gxio.c
diff -u src/sys/arch/evbarm/gumstix/gxio.c:1.18 src/sys/arch/evbarm/gumstix/gxio.c:1.19
--- src/sys/arch/evbarm/gumstix/gxio.c:1.18 Thu Sep 23 06:43:32 2010
+++ src/sys/arch/evbarm/gumstix/gxio.c Wed Dec 12 19:47:44 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.1
#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
