summaryrefslogtreecommitdiff
path: root/sys/dev/sun
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2009-02-20 22:55:26 +0000
committermartin <martin@NetBSD.org>2009-02-20 22:55:26 +0000
commitff1d9de35302471e56f29dd8257b2f77ececd7f2 (patch)
tree227b5af20b62e5c6549f82150e63ef76da2dc866 /sys/dev/sun
parent2302094ae3b9abfdaf0d0296d49fb3d3a373d61d (diff)
Include wsdisplay.h directly in the header to avoid different sizes
of cgsix_softc depending on proper previous includes by the includer due to #ifdef NWSDISPLAY. Thanks to kmem poison check and DEBUG kernels.
Diffstat (limited to 'sys/dev/sun')
-rw-r--r--sys/dev/sun/cgsix.c6
-rw-r--r--sys/dev/sun/cgsixvar.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 4898bc4422e..8dd2481913e 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.43 2009/01/01 13:53:53 jdc Exp $ */
+/* $NetBSD: cgsix.c,v 1.44 2009/02/20 22:55:26 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.43 2009/01/01 13:53:53 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.44 2009/02/20 22:55:26 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,14 +109,12 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.43 2009/01/01 13:53:53 jdc Exp $");
#include <dev/wscons/wsconsio.h>
#include <dev/wsfont/wsfont.h>
#include <dev/rasops/rasops.h>
-#include <dev/wscons/wsdisplay_vconsvar.h>
#include "opt_wsemul.h"
#include "rasops_glue.h"
#include <dev/sun/cgsixreg.h>
#include <dev/sun/cgsixvar.h>
-#include "wsdisplay.h"
static void cg6_unblank(device_t);
static void cg6_blank(struct cgsix_softc *, int);
diff --git a/sys/dev/sun/cgsixvar.h b/sys/dev/sun/cgsixvar.h
index 5afb034ffc8..060552c711a 100644
--- a/sys/dev/sun/cgsixvar.h
+++ b/sys/dev/sun/cgsixvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsixvar.h,v 1.11 2008/12/22 23:46:22 macallan Exp $ */
+/* $NetBSD: cgsixvar.h,v 1.12 2009/02/20 22:55:26 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,6 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "wsdisplay.h"
+#include <dev/wscons/wsdisplay_vconsvar.h>
+
/*
* color display (cgsix) driver; common definitions.
*/