From owner-svn-src-head@FreeBSD.ORG  Mon Jan  6 17:16:28 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A273B9E5;
 Mon,  6 Jan 2014 17:16:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E1CC16D6;
 Mon,  6 Jan 2014 17:16:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06HGSTm052699;
 Mon, 6 Jan 2014 17:16:28 GMT (envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06HGSi2052696;
 Mon, 6 Jan 2014 17:16:28 GMT (envelope-from andreast@svn.freebsd.org)
Message-Id: <201401061716.s06HGSi2052696@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Mon, 6 Jan 2014 17:16:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260375 - in head/sys/arm: arm include
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jan 2014 17:16:28 -0000

Author: andreast
Date: Mon Jan  6 17:16:27 2014
New Revision: 260375
URL: http://svnweb.freebsd.org/changeset/base/260375

Log:
  Fix arm build.
  
  Reviewed by:	ian, zbb

Modified:
  head/sys/arm/arm/trap.c
  head/sys/arm/include/intr.h
  head/sys/arm/include/psl.h

Modified: head/sys/arm/arm/trap.c
==============================================================================
--- head/sys/arm/arm/trap.c	Mon Jan  6 16:57:22 2014	(r260374)
+++ head/sys/arm/arm/trap.c	Mon Jan  6 17:16:27 2014	(r260375)
@@ -85,6 +85,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/bus.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>

Modified: head/sys/arm/include/intr.h
==============================================================================
--- head/sys/arm/include/intr.h	Mon Jan  6 16:57:22 2014	(r260374)
+++ head/sys/arm/include/intr.h	Mon Jan  6 17:16:27 2014	(r260375)
@@ -67,8 +67,6 @@
 #define NIRQ		32
 #endif
 
-#include <machine/psl.h>
-#include <sys/bus.h>
 
 int arm_get_next_irq(int);
 void arm_mask_irq(uintptr_t);

Modified: head/sys/arm/include/psl.h
==============================================================================
--- head/sys/arm/include/psl.h	Mon Jan  6 16:57:22 2014	(r260374)
+++ head/sys/arm/include/psl.h	Mon Jan  6 17:16:27 2014	(r260375)
@@ -46,7 +46,6 @@
 
 #ifndef _MACHINE_PSL_H_
 #define _MACHINE_PSL_H_
-#include <machine/intr.h>
 
 /*
  * These are the different SPL states