Module Name: src
Committed By: riz
Date: Sun Apr 22 17:01:44 UTC 2012
Modified Files:
src/sys/dev/ic [netbsd-6]: com.c
Log Message:
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>
To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.304.2.1 src/sys/dev/ic/com.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.304 src/sys/dev/ic/com.c:1.304.2.1
--- src/sys/dev/ic/com.c:1.304 Thu Feb 2 19:43:02 2012
+++ src/sys/dev/ic/com.c Sun Apr 22 17:01:44 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.30
#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 @@ __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.30
#include <sys/vnode.h>
#include <sys/kauth.h>
#include <sys/intr.h>
+#ifdef RND_COM
+#include <sys/rnd.h>
+#endif
+
#include <sys/bus.h>
