Module Name: src
Committed By: skrll
Date: Fri Jul 26 06:57:55 UTC 2019
Modified Files:
src/sys/arch/arm/imx: imx6_ccm.c imx6_pcie.c imxusb.c
src/sys/arch/arm/imx/fdt: imx6_pcie.c imx6_platform.c
Log Message:
Fix builds
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/imx/imx6_ccm.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/imx/imx6_pcie.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/fdt/imx6_pcie.c \
src/sys/arch/arm/imx/fdt/imx6_platform.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/arm/imx/imx6_ccm.c
diff -u src/sys/arch/arm/imx/imx6_ccm.c:1.11 src/sys/arch/arm/imx/imx6_ccm.c:1.12
--- src/sys/arch/arm/imx/imx6_ccm.c:1.11 Wed Jul 24 11:58:00 2019
+++ src/sys/arch/arm/imx/imx6_ccm.c Fri Jul 26 06:57:54 2019
@@ -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"
Index: src/sys/arch/arm/imx/imx6_pcie.c
diff -u src/sys/arch/arm/imx/imx6_pcie.c:1.10 src/sys/arch/arm/imx/imx6_pcie.c:1.11
--- src/sys/arch/arm/imx/imx6_pcie.c:1.10 Wed Jul 24 12:33:18 2019
+++ src/sys/arch/arm/imx/imx6_pcie.c Fri Jul 26 06:57:54 2019
@@ -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
Index: src/sys/arch/arm/imx/imxusb.c
diff -u src/sys/arch/arm/imx/imxusb.c:1.14 src/sys/arch/arm/imx/imxusb.c:1.15
--- src/sys/arch/arm/imx/imxusb.c:1.14 Wed Jul 24 11:20:55 2019
+++ src/sys/arch/arm/imx/imxusb.c Fri Jul 26 06:57:54 2019
@@ -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>
Index: src/sys/arch/arm/imx/fdt/imx6_pcie.c
diff -u src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.1 src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.2
--- src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.1 Wed Jul 24 13:12:33 2019
+++ src/sys/arch/arm/imx/fdt/imx6_pcie.c Fri Jul 26 06:57:54 2019
@@ -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
Index: src/sys/arch/arm/imx/fdt/imx6_platform.c
diff -u src/sys/arch/arm/imx/fdt/imx6_platform.c:1.1 src/sys/arch/arm/imx/fdt/imx6_platform.c:1.2
--- src/sys/arch/arm/imx/fdt/imx6_platform.c:1.1 Wed Jul 24 13:12:33 2019
+++ src/sys/arch/arm/imx/fdt/imx6_platform.c Fri Jul 26 06:57:55 2019
@@ -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>
