Sat Aug 28 07:06:29 2010 UTC ()
Fix build failed.  omap2_intr.h includes, if defined OMAP3530.


(kiyohara)
diff -r1.16 -r1.17 src/sys/arch/evbarm/gumstix/gxio.c
cvs diff -r1.16 -r1.17 src/sys/arch/evbarm/gumstix/gxio.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/gumstix/gxio.c 2010/08/28 04:39:42 1.16
+++ src/sys/arch/evbarm/gumstix/gxio.c 2010/08/28 07:06:29 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gxio.c,v 1.16 2010/08/28 04:39:42 kiyohara Exp $ */ 1/* $NetBSD: gxio.c,v 1.17 2010/08/28 07:06:29 kiyohara Exp $ */
2/* 2/*
3 * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation. 3 * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM 6 * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM
7 * Corporation. 7 * Corporation.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -21,44 +21,49 @@ @@ -21,44 +21,49 @@
21 * THIS SOFTWARE IS PROVIDED BY THE PROJECT and SOUM CORPORATION ``AS IS'' 21 * THIS SOFTWARE IS PROVIDED BY THE PROJECT and SOUM CORPORATION ``AS IS''
22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
23 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 23 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT AND SOUM CORPORATION 24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT AND SOUM CORPORATION
25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 31 * POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.16 2010/08/28 04:39:42 kiyohara Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.17 2010/08/28 07:06:29 kiyohara Exp $");
35 35
36#include "opt_cputypes.h" 36#include "opt_cputypes.h"
37#include "opt_gumstix.h" 37#include "opt_gumstix.h"
38#include "opt_gxio.h" 38#include "opt_gxio.h"
 39#if defined(OVERO)
 40#include "opt_omap.h"
 41#endif
39 42
40#include <sys/param.h> 43#include <sys/param.h>
41#include <sys/device.h> 44#include <sys/device.h>
42#include <sys/errno.h> 45#include <sys/errno.h>
43#include <sys/kernel.h> 46#include <sys/kernel.h>
44 47
45#include <sys/systm.h> 48#include <sys/systm.h>
46 49
47#include <machine/bootconfig.h> 50#include <machine/bootconfig.h>
48 51
49#include <arm/omap/omap2_gpmcreg.h> 52#include <arm/omap/omap2_gpmcreg.h>
50#include <arm/omap/omap2_reg.h> 53#include <arm/omap/omap2_reg.h>
 54#if defined(OMAP3530)
51#include <arm/omap/omap2_intr.h> 55#include <arm/omap/omap2_intr.h>
 56#endif
52#include <arm/omap/omap_var.h> 57#include <arm/omap/omap_var.h>
53#if defined(CPU_XSCALE_PXA270) || defined(CPU_XSCALE_PXA250) 58#if defined(CPU_XSCALE_PXA270) || defined(CPU_XSCALE_PXA250)
54#include <arm/xscale/pxa2x0cpu.h> 59#include <arm/xscale/pxa2x0cpu.h>
55#endif 60#endif
56#include <arm/xscale/pxa2x0reg.h> 61#include <arm/xscale/pxa2x0reg.h>
57#include <arm/xscale/pxa2x0var.h> 62#include <arm/xscale/pxa2x0var.h>
58#include <arm/xscale/pxa2x0_gpio.h> 63#include <arm/xscale/pxa2x0_gpio.h>
59#include <evbarm/gumstix/gumstixreg.h> 64#include <evbarm/gumstix/gumstixreg.h>
60#include <evbarm/gumstix/gumstixvar.h> 65#include <evbarm/gumstix/gumstixvar.h>
61 66
62#include "ioconf.h" 67#include "ioconf.h"
63#include "locators.h" 68#include "locators.h"
64 69