Module Name: src
Committed By: bsh
Date: Mon Nov 15 09:34:28 UTC 2010
Modified Files:
src/sys/arch/arm/omap: omap2_icu.c omap2_intr.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2_icu.c \
src/sys/arch/arm/omap/omap2_intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/omap2_icu.c
diff -u src/sys/arch/arm/omap/omap2_icu.c:1.5 src/sys/arch/arm/omap/omap2_icu.c:1.6
--- src/sys/arch/arm/omap/omap2_icu.c:1.5 Wed Oct 22 10:45:47 2008
+++ src/sys/arch/arm/omap/omap2_icu.c Mon Nov 15 09:34:28 2010
@@ -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>
Index: src/sys/arch/arm/omap/omap2_intr.h
diff -u src/sys/arch/arm/omap/omap2_intr.h:1.5 src/sys/arch/arm/omap/omap2_intr.h:1.6
--- src/sys/arch/arm/omap/omap2_intr.h:1.5 Sat Aug 28 04:06:40 2010
+++ src/sys/arch/arm/omap/omap2_intr.h Mon Nov 15 09:34:28 2010
@@ -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>
