 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_drv.h,v 1.46 2021/12/19 11:55:24 riastradh Exp $	*/
+/*	$NetBSD: i915_drv.h,v 1.47 2022/02/27 14:22:29 riastradh Exp $	*/
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
 /*
+ *
  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sub license, and/or sell copies of the Software, and to
 @@ -24,29 +24,27 @@
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
  * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  */
 #ifndef _I915_DRV_H_
 #define _I915_DRV_H_
 #if defined(__NetBSD__)
 #ifdef _KERNEL_OPT
 #if defined(i386) || defined(amd64)
 #include "acpica.h"
 #endif	/* i386 || amd64 */
 #endif	/* _KERNEL_OPT */
 #if (NACPICA > 0)
 #define CONFIG_ACPI
 #endif	/* NACPICA > 0 */
 #endif	/* __NetBSD__ */
 #include <uapi/drm/i915_drm.h>
 #include <uapi/drm/drm_fourcc.h>
 #include <linux/io-mapping.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/backlight.h>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.h,v 1.7 2022/02/27 14:22:21 riastradh Exp $	*/
+/*	$NetBSD: acpi.h,v 1.8 2022/02/27 14:22:29 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,31 +23,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_ACPI_H_
 #define _LINUX_ACPI_H_
 #ifdef _KERNEL_OPT
 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)
 #include "acpica.h"
 #else
 #define NACPICA 0
 #endif
 #endif
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #endif
 #include <linux/types.h>
 #include <linux/uuid.h>
 typedef ACPI_HANDLE acpi_handle;
 typedef ACPI_OBJECT_TYPE acpi_object_type;
 typedef ACPI_STATUS acpi_status;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci.h,v 1.51 2021/12/19 12:13:16 riastradh Exp $	*/
+/*	$NetBSD: pci.h,v 1.52 2022/02/27 14:22:29 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,31 +23,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _LINUX_PCI_H_
 #define _LINUX_PCI_H_
 #ifdef _KERNEL_OPT
 #if defined(i386) || defined(amd64) || defined(__aarch64__)
 #include "acpica.h"
 #else	/* !(i386 || amd64) */
 #define NACPICA	0
 #endif	/* i386 || amd64 */
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cdefs.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <machine/limits.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>