From 951154084fadc1a8a7c4eb72ac2f51fc473f0189 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 21 Jul 2016 13:01:35 +0000
Subject: [PATCH] Fix the build:  * Add acpi_if.h to the SRC list in the uart
 module  * Only include new acpi headers when they are needed

Obtained from:	ABT Systems Ltd
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
---
 sys/dev/uart/uart_bus_acpi.c | 2 ++
 sys/modules/uart/Makefile    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 47dd969f4d0..7c582683f4e 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -41,9 +41,11 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu_acpi.h>
 
+#ifdef __aarch64__
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <dev/acpica/acpivar.h>
+#endif
 
 static int uart_acpi_probe(device_t dev);
 
diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index 9a21ddc317f..3caa61de8ae 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -32,7 +32,8 @@ SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
 	uart_dev_z8530.c \
 	uart_if.c uart_if.h uart_subr.c uart_tty.c
 
-SRCS+=	bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
+SRCS+=	acpi_if.h bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} \
+	pci_if.h \
 	power_if.h pccarddevs.h serdev_if.h
 SRCS+=	opt_platform.h opt_uart.h