svn commit: r303143 - in head/sys: dev/uart modules/uart

[Andrew Turner]

Author: andrew
Date: Thu Jul 21 13:01:35 2016
New Revision: 303143
URL: https://svnweb.freebsd.org/changeset/base/303143

Log:
  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

Modified:
  head/sys/dev/uart/uart_bus_acpi.c
  head/sys/modules/uart/Makefile

Modified: head/sys/dev/uart/uart_bus_acpi.c
==============================================================================
--- head/sys/dev/uart/uart_bus_acpi.c	Thu Jul 21 12:53:36 2016	(r303142)
+++ head/sys/dev/uart/uart_bus_acpi.c	Thu Jul 21 13:01:35 2016	(r303143)
@@ -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);
 

Modified: head/sys/modules/uart/Makefile
==============================================================================
--- head/sys/modules/uart/Makefile	Thu Jul 21 12:53:36 2016	(r303142)
+++ head/sys/modules/uart/Makefile	Thu Jul 21 13:01:35 2016	(r303143)
@@ -32,7 +32,8 @@ SRCS=	uart_bus_acpi.c ${uart_bus_ebus} u
 	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