Module Name: src
Committed By: thorpej
Date: Sun Apr 25 21:52:28 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom [thorpej-i2c-spi-conf]: bcm2835_bsc_acpi.c
src/sys/arch/x86/pci [thorpej-i2c-spi-conf]: dwiic_pci.c
src/sys/dev/acpi [thorpej-i2c-spi-conf]: dwiic_acpi.c nxpiic_acpi.c
Log Message:
acpi_i2c.h is no more.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/x86/pci/dwiic_pci.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/acpi/dwiic_acpi.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/dev/acpi/nxpiic_acpi.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/broadcom/bcm2835_bsc_acpi.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3 src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3.2.1
--- src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c:1.3 Sat Apr 24 23:36:26 2021
+++ src/sys/arch/arm/broadcom/bcm2835_bsc_acpi.c Sun Apr 25 21:52:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3 2021/04/24 23:36:26 thorpej Exp $ */
+/* $NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.1 2021/04/25 21:52:28 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3 2021/04/24 23:36:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_acpi.c,v 1.3.2.1 2021/04/25 21:52:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_intr.h>
-#include <dev/acpi/acpi_i2c.h>
#include <arm/broadcom/bcm2835var.h>
#include <arm/broadcom/bcm2835_mbox.h>
Index: src/sys/arch/x86/pci/dwiic_pci.c
diff -u src/sys/arch/x86/pci/dwiic_pci.c:1.4 src/sys/arch/x86/pci/dwiic_pci.c:1.4.2.1
--- src/sys/arch/x86/pci/dwiic_pci.c:1.4 Sat Apr 24 23:36:51 2021
+++ src/sys/arch/x86/pci/dwiic_pci.c Sun Apr 25 21:52:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_pci.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.4.2.1 2021/04/25 21:52:28 thorpej Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.4.2.1 2021/04/25 21:52:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_pci.h>
#include <dev/acpi/acpi_util.h>
-#include <dev/acpi/acpi_i2c.h>
#include <dev/ic/dwiic_var.h>
#include <arch/x86/pci/lpssreg.h>
Index: src/sys/dev/acpi/dwiic_acpi.c
diff -u src/sys/dev/acpi/dwiic_acpi.c:1.8 src/sys/dev/acpi/dwiic_acpi.c:1.8.2.1
--- src/sys/dev/acpi/dwiic_acpi.c:1.8 Sat Apr 24 23:36:52 2021
+++ src/sys/dev/acpi/dwiic_acpi.c Sun Apr 25 21:52:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $ */
+/* $NetBSD: dwiic_acpi.c,v 1.8.2.1 2021/04/25 21:52:28 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8 2021/04/24 23:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.8.2.1 2021/04/25 21:52:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_intr.h>
-#include <dev/acpi/acpi_i2c.h>
#include <dev/ic/dwiic_var.h>
Index: src/sys/dev/acpi/nxpiic_acpi.c
diff -u src/sys/dev/acpi/nxpiic_acpi.c:1.4 src/sys/dev/acpi/nxpiic_acpi.c:1.4.6.1
--- src/sys/dev/acpi/nxpiic_acpi.c:1.4 Fri Jan 29 02:26:58 2021
+++ src/sys/dev/acpi/nxpiic_acpi.c Sun Apr 25 21:52:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nxpiic_acpi.c,v 1.4 2021/01/29 02:26:58 thorpej Exp $ */
+/* $NetBSD: nxpiic_acpi.c,v 1.4.6.1 2021/04/25 21:52:28 thorpej Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nxpiic_acpi.c,v 1.4 2021/01/29 02:26:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nxpiic_acpi.c,v 1.4.6.1 2021/04/25 21:52:28 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: nxpiic_acpi.
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_intr.h>
-#include <dev/acpi/acpi_i2c.h>
#include <dev/i2c/motoi2cvar.h>
#include <dev/i2c/motoi2creg.h>
