[src/trunk]: src/sys/arch/arm/imx Fix builds

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

details:   https://anonhg.NetBSD.org/src/rev/1838a93c3445
branches:  trunk
changeset: 457990:1838a93c3445
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jul 26 06:57:54 2019 +0000

description:
Fix builds

diffstat:

 sys/arch/arm/imx/fdt/imx6_pcie.c     |  5 ++---
 sys/arch/arm/imx/fdt/imx6_platform.c |  5 ++---
 sys/arch/arm/imx/imx6_ccm.c          |  5 ++---
 sys/arch/arm/imx/imx6_pcie.c         |  5 ++---
 sys/arch/arm/imx/imxusb.c            |  5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diffs (112 lines):

diff -r e2d2bf891b79 -r 1838a93c3445 sys/arch/arm/imx/fdt/imx6_pcie.c
--- a/sys/arch/arm/imx/fdt/imx6_pcie.c  Fri Jul 26 06:37:15 2019 +0000
+++ b/sys/arch/arm/imx/fdt/imx6_pcie.c  Fri Jul 26 06:57:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_pcie.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $    */
+/*     $NetBSD: imx6_pcie.c,v 1.2 2019/07/26 06:57:54 skrll Exp $      */
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,13 +25,12 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.2 2019/07/26 06:57:54 skrll Exp $");
 
 #include "opt_pci.h"
 #include "opt_fdt.h"
 
 #include "pci.h"
-#include "imxgpio.h"
 #include "locators.h"
 
 #define        _INTR_PRIVATE
diff -r e2d2bf891b79 -r 1838a93c3445 sys/arch/arm/imx/fdt/imx6_platform.c
--- a/sys/arch/arm/imx/fdt/imx6_platform.c      Fri Jul 26 06:37:15 2019 +0000
+++ b/sys/arch/arm/imx/fdt/imx6_platform.c      Fri Jul 26 06:57:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_platform.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $        */
+/*     $NetBSD: imx6_platform.c,v 1.2 2019/07/26 06:57:55 skrll Exp $  */
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,13 +25,12 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.2 2019/07/26 06:57:55 skrll Exp $");
 
 #include "opt_soc.h"
 #include "arml2cc.h"
 #include "opt_multiprocessor.h"
 #include "opt_fdt.h"
-#include "opt_fdt_arm.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff -r e2d2bf891b79 -r 1838a93c3445 sys/arch/arm/imx/imx6_ccm.c
--- a/sys/arch/arm/imx/imx6_ccm.c       Fri Jul 26 06:37:15 2019 +0000
+++ b/sys/arch/arm/imx/imx6_ccm.c       Fri Jul 26 06:57:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_ccm.c,v 1.11 2019/07/24 11:58:00 hkenken Exp $    */
+/*     $NetBSD: imx6_ccm.c,v 1.12 2019/07/26 06:57:54 skrll Exp $      */
 
 /*
  * Copyright (c) 2010-2012, 2014  Genetec Corporation.  All rights reserved.
@@ -30,9 +30,8 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.11 2019/07/24 11:58:00 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.12 2019/07/26 06:57:54 skrll Exp $");
 
-#include "opt_imx.h"
 #include "opt_cputypes.h"
 
 #include "locators.h"
diff -r e2d2bf891b79 -r 1838a93c3445 sys/arch/arm/imx/imx6_pcie.c
--- a/sys/arch/arm/imx/imx6_pcie.c      Fri Jul 26 06:37:15 2019 +0000
+++ b/sys/arch/arm/imx/imx6_pcie.c      Fri Jul 26 06:57:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_pcie.c,v 1.10 2019/07/24 12:33:18 hkenken Exp $   */
+/*     $NetBSD: imx6_pcie.c,v 1.11 2019/07/26 06:57:54 skrll Exp $     */
 
 /*
  * Copyright (c) 2016  Genetec Corporation.  All rights reserved.
@@ -31,12 +31,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.10 2019/07/24 12:33:18 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.11 2019/07/26 06:57:54 skrll Exp $");
 
 #include "opt_pci.h"
 
 #include "pci.h"
-#include "imxgpio.h"
 #include "locators.h"
 
 #define        _INTR_PRIVATE
diff -r e2d2bf891b79 -r 1838a93c3445 sys/arch/arm/imx/imxusb.c
--- a/sys/arch/arm/imx/imxusb.c Fri Jul 26 06:37:15 2019 +0000
+++ b/sys/arch/arm/imx/imxusb.c Fri Jul 26 06:57:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imxusb.c,v 1.14 2019/07/24 11:20:55 hkenken Exp $      */
+/*     $NetBSD: imxusb.c,v 1.15 2019/07/26 06:57:54 skrll Exp $        */
 /*
  * Copyright (c) 2009, 2010  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi and Hiroyuki Bessho for Genetec Corporation.
@@ -25,10 +25,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.14 2019/07/24 11:20:55 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.15 2019/07/26 06:57:54 skrll Exp $");
 
 #include "locators.h"
-#include "opt_imx.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>