Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic don't include <sys/rnd.h> before we define cn_tra...



details:   https://anonhg.NetBSD.org/src/rev/9a7ac6975e89
branches:  trunk
changeset: 778963:9a7ac6975e89
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 22 16:00:45 2012 +0000

description:
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 26077d8fe2ea -r 9a7ac6975e89 sys/dev/ic/com.c
--- a/sys/dev/ic/com.c  Sun Apr 22 15:55:41 2012 +0000
+++ b/sys/dev/ic/com.c  Sun Apr 22 16:00:45 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.305 2012/04/22 16:00:45 christos 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.305 2012/04/22 16:00:45 christos 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>
 



Home | Main Index | Thread Index | Old Index