From owner-svn-src-head@freebsd.org  Thu Jul 21 13:01:37 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 046B4B9EC5B;
 Thu, 21 Jul 2016 13:01:37 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C22351E47;
 Thu, 21 Jul 2016 13:01:36 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6LD1ZhI057723;
 Thu, 21 Jul 2016 13:01:35 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6LD1ZJv057721;
 Thu, 21 Jul 2016 13:01:35 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201607211301.u6LD1ZJv057721@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Thu, 21 Jul 2016 13:01:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303143 - in head/sys: dev/uart modules/uart
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jul 2016 13:01:37 -0000

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