From 9943d3dff0fa937e0ea47f58c90d6d293eacf0b4 Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Sat, 25 Aug 2018 18:42:43 +0000
Subject: [PATCH] Use __HAVE_ACPI to decide whether ACPI support should be
 considered.

ok deraadt@, krw@, jca@
---
 sys/dev/pci/drm/drm_linux.c          | 4 ++--
 sys/dev/pci/drm/radeon/radeon_bios.c | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c
index a414a2623a7..f71aab59c23 100644
--- a/sys/dev/pci/drm/drm_linux.c
+++ b/sys/dev/pci/drm/drm_linux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: drm_linux.c,v 1.30 2018/08/20 16:00:22 mpi Exp $	*/
+/*	$OpenBSD: drm_linux.c,v 1.31 2018/08/25 18:42:43 kettenis Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org>
  * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org>
@@ -729,7 +729,7 @@ vga_put(struct pci_dev *pdev, int rsrc)
  * ACPI types and interfaces.
  */
 
-#if defined(__amd64__) || defined(__i386__)
+#ifdef __HAVE_ACPI
 #include "acpi.h"
 #endif
 
diff --git a/sys/dev/pci/drm/radeon/radeon_bios.c b/sys/dev/pci/drm/radeon/radeon_bios.c
index 370322c27b9..c35485b6b8b 100644
--- a/sys/dev/pci/drm/radeon/radeon_bios.c
+++ b/sys/dev/pci/drm/radeon/radeon_bios.c
@@ -33,13 +33,16 @@
 #if defined(__amd64__) || defined(__i386__)
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
-#include "acpi.h"
 #endif
 
 #if defined (__loongson__)
 #include <machine/autoconf.h>
 #endif
 
+#ifdef __HAVE_ACPI
+#include "acpi.h"
+#endif
+
 /*
  * BIOS.
  */
-- 
2.20.1