[src/riastradh-drm2]: src/sys/dev Make genfb a little friendlier to modules.

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

details:   https://anonhg.NetBSD.org/src/rev/7c0686098630
branches:  riastradh-drm2
changeset: 788634:7c0686098630
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jan 29 19:52:11 2014 +0000

description:
Make genfb a little friendlier to modules.

This is not enough to make it actually work as a module itself, but
it's enough to make the i915drm module use genfb.

diffstat:

 sys/dev/wscons/wsdisplay_vconsvar.h |  4 +++-
 sys/dev/wsfb/genfb.c                |  6 ++++--
 sys/dev/wsfb/genfbvar.h             |  8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diffs (84 lines):

diff -r 3366e5b88a1f -r 7c0686098630 sys/dev/wscons/wsdisplay_vconsvar.h
--- a/sys/dev/wscons/wsdisplay_vconsvar.h       Wed Jan 29 19:48:45 2014 +0000
+++ b/sys/dev/wscons/wsdisplay_vconsvar.h       Wed Jan 29 19:52:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsdisplay_vconsvar.h,v 1.22 2013/01/27 03:59:09 macallan Exp $ */
+/*     $NetBSD: wsdisplay_vconsvar.h,v 1.22.8.1 2014/01/29 19:52:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2005, 2006 Michael Lorenz
@@ -29,8 +29,10 @@
 #ifndef _WSDISPLAY_VCONS_H_
 #define _WSDISPLAY_VCONS_H_
 
+#ifdef _KERNEL_OPT
 #include "opt_wsdisplay_compat.h"
 #include "opt_vcons.h"
+#endif
 
 struct vcons_data;
 
diff -r 3366e5b88a1f -r 7c0686098630 sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c      Wed Jan 29 19:48:45 2014 +0000
+++ b/sys/dev/wsfb/genfb.c      Wed Jan 29 19:52:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $ */
+/*     $NetBSD: genfb.c,v 1.50.8.3 2014/01/29 19:52:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.3 2014/01/29 19:52:11 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,8 +55,10 @@
                AB_VERBOSE | AB_DEBUG) )
 #endif
 
+#ifdef _KERNEL_OPT
 #include "opt_genfb.h"
 #include "opt_wsfb.h"
+#endif
 
 #ifdef GENFB_DEBUG
 #define GPRINTF panic
diff -r 3366e5b88a1f -r 7c0686098630 sys/dev/wsfb/genfbvar.h
--- a/sys/dev/wsfb/genfbvar.h   Wed Jan 29 19:48:45 2014 +0000
+++ b/sys/dev/wsfb/genfbvar.h   Wed Jan 29 19:52:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $ */
+/*     $NetBSD: genfbvar.h,v 1.21.24.1 2014/01/29 19:52:12 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,12 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.21.24.1 2014/01/29 19:52:12 riastradh Exp $");
 
 #ifndef GENFBVAR_H
 #define GENFBVAR_H
 
+#ifdef _KERNEL_OPT
 #include "opt_splash.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -46,7 +48,9 @@
 #include <dev/rasops/rasops.h>
 
 #include <dev/wscons/wsdisplay_vconsvar.h>
+#ifdef _KERNEL_OPT
 #include "opt_genfb.h"
+#endif
 
 #ifdef SPLASHSCREEN
 #define GENFB_DISABLE_TEXT