Tue Dec 22 22:32:54 2015 UTC ()
build fix


(jmcneill)
diff -r1.6 -r1.7 src/sys/arch/arm/samsung/exynos_i2c.c

cvs diff -r1.6 -r1.7 src/sys/arch/arm/samsung/exynos_i2c.c (expand / switch to unified diff)

--- src/sys/arch/arm/samsung/exynos_i2c.c 2015/12/21 04:58:50 1.6
+++ src/sys/arch/arm/samsung/exynos_i2c.c 2015/12/22 22:32:54 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: exynos_i2c.c,v 1.6 2015/12/21 04:58:50 marty Exp $ */ 1/* $NetBSD: exynos_i2c.c,v 1.7 2015/12/22 22:32:54 jmcneill Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2014 The NetBSD Foundation, Inc. 4 * Copyright (c) 2014 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Reinoud Zandijk. 8 * by Reinoud Zandijk.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -22,30 +22,29 @@ @@ -22,30 +22,29 @@
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 * 30 *
31 */ 31 */
32 32
33#include "opt_exynos.h" 33#include "opt_exynos.h"
34#include "opt_arm_debug.h" 34#include "opt_arm_debug.h"
35#include "exynos_iic.h" 
36 35
37#include <sys/cdefs.h> 36#include <sys/cdefs.h>
38__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.6 2015/12/21 04:58:50 marty Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.7 2015/12/22 22:32:54 jmcneill Exp $");
39 38
40#include <sys/param.h> 39#include <sys/param.h>
41#include <sys/bus.h> 40#include <sys/bus.h>
42#include <sys/device.h> 41#include <sys/device.h>
43#include <sys/intr.h> 42#include <sys/intr.h>
44#include <sys/systm.h> 43#include <sys/systm.h>
45#include <sys/kmem.h> 44#include <sys/kmem.h>
46 45
47#include <arm/samsung/exynos_reg.h> 46#include <arm/samsung/exynos_reg.h>
48#include <arm/samsung/exynos_intr.h> 47#include <arm/samsung/exynos_intr.h>
49 48
50#include <sys/gpio.h> 49#include <sys/gpio.h>
51#include <dev/gpio/gpiovar.h> 50#include <dev/gpio/gpiovar.h>