Module Name: src
Committed By: jmcneill
Date: Sat Jan 18 03:00:04 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/include/linux: acpi.h pci.h
Log Message:
Pull in acpica.h on aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/acpi.h
cvs rdiff -u -r1.37 -r1.38 src/sys/external/bsd/drm2/include/linux/pci.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/acpi.h
diff -u src/sys/external/bsd/drm2/include/linux/acpi.h:1.4 src/sys/external/bsd/drm2/include/linux/acpi.h:1.5
--- src/sys/external/bsd/drm2/include/linux/acpi.h:1.4 Sat Oct 17 21:07:23 2015
+++ src/sys/external/bsd/drm2/include/linux/acpi.h Sat Jan 18 03:00:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.h,v 1.4 2015/10/17 21:07:23 jmcneill Exp $ */
+/* $NetBSD: acpi.h,v 1.5 2020/01/18 03:00:04 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _LINUX_ACPI_H_
#ifdef _KERNEL_OPT
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__)
#include "acpica.h"
#else
#define NACPICA 0
Index: src/sys/external/bsd/drm2/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.37 src/sys/external/bsd/drm2/include/linux/pci.h:1.38
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.37 Mon Aug 27 14:16:38 2018
+++ src/sys/external/bsd/drm2/include/linux/pci.h Sat Jan 18 03:00:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.37 2018/08/27 14:16:38 riastradh Exp $ */
+/* $NetBSD: pci.h,v 1.38 2020/01/18 03:00:04 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _LINUX_PCI_H_
#ifdef _KERNEL_OPT
-#if defined(i386) || defined(amd64)
+#if defined(i386) || defined(amd64) || defined(__aarch64__)
#include "acpica.h"
#else /* !(i386 || amd64) */
#define NACPICA 0
