[src/netbsd-6]: src/sys/dev/ic Pull up following revision(s) (requested by ch...

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

details:   https://anonhg.NetBSD.org/src/rev/2c19d73bd67f
branches:  netbsd-6
changeset: 774024:2c19d73bd67f
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Apr 22 17:01:44 2012 +0000

description:
Pull up following revision(s) (requested by christos in ticket #190):
        sys/dev/ic/com.c: revision 1.305
don't include<sys/rnd.h>  before we define cn_trap, because it might bring
in<sys/systm.h>

diffstat:

 sys/dev/ic/com.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r cff7baedb31e -r 2c19d73bd67f sys/dev/ic/com.c
--- a/sys/dev/ic/com.c  Fri Apr 20 23:35:54 2012 +0000
+++ b/sys/dev/ic/com.c  Sun Apr 22 17:01:44 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.304 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: com.c,v 1.304.2.1 2012/04/22 17:01:44 riz Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.304 2012/02/02 19:43:02 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.304.2.1 2012/04/22 17:01:44 riz Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -76,9 +76,6 @@
 #include "opt_ntp.h"
 
 #include "rnd.h"
-#ifdef RND_COM
-#include <sys/rnd.h>
-#endif
 
 /* The COM16650 option was renamed to COM_16650. */
 #ifdef COM16650
@@ -115,6 +112,10 @@
 #include <sys/vnode.h>
 #include <sys/kauth.h>
 #include <sys/intr.h>
+#ifdef RND_COM
+#include <sys/rnd.h>
+#endif
+
 
 #include <sys/bus.h>