svn commit: r260375 - in head/sys/arm: arm include

[Andreas Tobler]

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