[src/trunk]: src/sys/arch/arm/omap don't include <arm/cpu.h> which requires S...

[bsh <bsh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/370eb3cce0da
branches:  trunk
changeset: 758777:370eb3cce0da
user:      bsh <bsh%NetBSD.org@localhost>
date:      Mon Nov 15 09:34:28 2010 +0000

description:
don't include <arm/cpu.h> which requires SOFTINT_COUNT before <sys/intr.h>
is fully included.
This change makes Beagleboard kernel compile again after uebayashi's change
to sys/param.h.

diffstat:

 sys/arch/arm/omap/omap2_icu.c  |  5 +++--
 sys/arch/arm/omap/omap2_intr.h |  3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 7db5fe68af7c -r 370eb3cce0da sys/arch/arm/omap/omap2_icu.c
--- a/sys/arch/arm/omap/omap2_icu.c     Mon Nov 15 09:25:58 2010 +0000
+++ b/sys/arch/arm/omap/omap2_icu.c     Mon Nov 15 09:34:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_icu.c,v 1.5 2008/10/22 10:45:47 matt Exp $       */
+/*     $NetBSD: omap2_icu.c,v 1.6 2010/11/15 09:34:28 bsh Exp $        */
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -30,10 +30,11 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.5 2008/10/22 10:45:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.6 2010/11/15 09:34:28 bsh Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
+#include <sys/device.h>
 
 #include <uvm/uvm_extern.h>
 
diff -r 7db5fe68af7c -r 370eb3cce0da sys/arch/arm/omap/omap2_intr.h
--- a/sys/arch/arm/omap/omap2_intr.h    Mon Nov 15 09:25:58 2010 +0000
+++ b/sys/arch/arm/omap/omap2_intr.h    Mon Nov 15 09:34:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_intr.h,v 1.5 2010/08/28 04:06:40 kiyohara Exp $ */
+/*     $NetBSD: omap2_intr.h,v 1.6 2010/11/15 09:34:28 bsh Exp $ */
 
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
@@ -34,7 +34,6 @@
 
 #ifndef _LOCORE
 
-#include <arm/cpu.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>