[src/netbsd-3-0]: src/sys/arch Pull up following revision(s) (requested by os...

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

details:   https://anonhg.NetBSD.org/src/rev/487274598994
branches:  netbsd-3-0
changeset: 579206:487274598994
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Apr 21 12:26:54 2006 +0000

description:
Pull up following revision(s) (requested by oster in ticket #1284):
        sys/arch/mvme68k/include/param.h: revision 1.27
        sys/arch/hp300/include/param.h: revision 1.46
Patterned after next68k, omit inclusion of <sys/device.h> if we
are not in _KERNEL.  This should work around our lint problems
related to "unspecified-size array at end of struct" constructs.

diffstat:

 sys/arch/hp300/include/param.h   |  4 +++-
 sys/arch/mvme68k/include/param.h |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 1d80c3e50fa3 -r 487274598994 sys/arch/hp300/include/param.h
--- a/sys/arch/hp300/include/param.h    Wed Apr 19 21:03:46 2006 +0000
+++ b/sys/arch/hp300/include/param.h    Fri Apr 21 12:26:54 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.45 2004/08/28 19:46:41 thorpej Exp $       */
+/*     $NetBSD: param.h,v 1.45.14.1 2006/04/21 12:26:54 tron Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -85,10 +85,12 @@
 #define        _MACHINE        hp300
 #define        MACHINE         "hp300"
 
+#ifdef _KERNEL
 /*
  * Interrupt glue.
  */
 #include <machine/intr.h>
+#endif /* _KERNEL */
 
 #define        PGSHIFT         12              /* LOG2(NBPG) */
 #define        KERNBASE        0x00000000      /* start of kernel virtual */
diff -r 1d80c3e50fa3 -r 487274598994 sys/arch/mvme68k/include/param.h
--- a/sys/arch/mvme68k/include/param.h  Wed Apr 19 21:03:46 2006 +0000
+++ b/sys/arch/mvme68k/include/param.h  Fri Apr 21 12:26:54 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.26 2003/08/07 16:28:41 agc Exp $   */
+/*     $NetBSD: param.h,v 1.26.20.1 2006/04/21 12:26:54 tron Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -85,10 +85,12 @@
 #define        _MACHINE        mvme68k
 #define        MACHINE         "mvme68k"
 
+#ifdef _KERNEL
 /*
  * Grab the interrupt definitions
  */
 #include <machine/intr.h>
+#endif /* _KERNEL */
 
 #define        PGSHIFT         12              /* LOG2(NBPG) */
 #define        KERNBASE        0x00000000      /* start of kernel virtual */