[src/trunk]: src/sys Undo previous as it broke things.

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

details:   https://anonhg.NetBSD.org/src/rev/4a19ef942871
branches:  trunk
changeset: 550925:4a19ef942871
user:      uwe <uwe%NetBSD.org@localhost>
date:      Mon Aug 25 17:50:22 2003 +0000

description:
Undo previous as it broke things.

There are some scattered implicit RASTERCONSOLE dependencies,
so there should be a better way.

diffstat:

 sys/arch/sparc/dev/cgeight.c        |  6 ++----
 sys/arch/sparc/dev/cgfour.c         |  6 ++----
 sys/arch/sparc/dev/cgfourteen.c     |  6 ++----
 sys/arch/sparc/dev/cgtwo.c          |  6 ++----
 sys/arch/sparc/dev/kd.c             |  5 ++---
 sys/arch/sparc/sparc/autoconf.c     |  5 ++---
 sys/arch/sparc64/dev/kd.c           |  6 ++----
 sys/arch/sparc64/sparc64/autoconf.c |  5 ++---
 sys/arch/sun2/dev/kd.c              |  6 ++----
 sys/dev/rcons/files.rcons           |  5 ++---
 sys/dev/sbus/p9100.c                |  6 ++----
 sys/dev/sbus/zx.c                   |  6 ++----
 sys/dev/sun/bt_subr.c               |  6 ++----
 sys/dev/sun/bwtwo.c                 |  6 ++----
 sys/dev/sun/cgsix.c                 |  6 ++----
 sys/dev/sun/cgthree.c               |  6 ++----
 sys/dev/sun/fb.c                    |  6 ++----
 17 files changed, 34 insertions(+), 64 deletions(-)

diffs (truncated from 343 to 300 lines):

diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc/dev/cgeight.c
--- a/sys/arch/sparc/dev/cgeight.c      Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc/dev/cgeight.c      Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgeight.c,v 1.37 2003/08/24 17:31:59 uwe Exp $ */
+/*     $NetBSD: cgeight.c,v 1.38 2003/08/25 17:50:24 uwe Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -128,9 +128,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgeight.c,v 1.37 2003/08/24 17:31:59 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: cgeight.c,v 1.38 2003/08/25 17:50:24 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc/dev/cgfour.c
--- a/sys/arch/sparc/dev/cgfour.c       Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc/dev/cgfour.c       Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfour.c,v 1.36 2003/08/24 17:31:59 uwe Exp $  */
+/*     $NetBSD: cgfour.c,v 1.37 2003/08/25 17:50:25 uwe Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -132,9 +132,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgfour.c,v 1.36 2003/08/24 17:31:59 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: cgfour.c,v 1.37 2003/08/25 17:50:25 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc/dev/cgfourteen.c
--- a/sys/arch/sparc/dev/cgfourteen.c   Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc/dev/cgfourteen.c   Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfourteen.c,v 1.36 2003/08/24 17:32:00 uwe Exp $ */
+/*     $NetBSD: cgfourteen.c,v 1.37 2003/08/25 17:50:25 uwe Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -78,9 +78,7 @@
 #undef CG14_CG8
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgfourteen.c,v 1.36 2003/08/24 17:32:00 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: cgfourteen.c,v 1.37 2003/08/25 17:50:25 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc/dev/cgtwo.c
--- a/sys/arch/sparc/dev/cgtwo.c        Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc/dev/cgtwo.c        Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgtwo.c,v 1.48 2003/08/24 17:32:00 uwe Exp $ */
+/*     $NetBSD: cgtwo.c,v 1.49 2003/08/25 17:50:25 uwe Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,9 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgtwo.c,v 1.48 2003/08/24 17:32:00 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: cgtwo.c,v 1.49 2003/08/25 17:50:25 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc/dev/kd.c
--- a/sys/arch/sparc/dev/kd.c   Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc/dev/kd.c   Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kd.c,v 1.27 2003/08/24 17:32:00 uwe Exp $      */
+/*     $NetBSD: kd.c,v 1.28 2003/08/25 17:50:26 uwe Exp $      */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,10 +46,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.27 2003/08/24 17:32:00 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.28 2003/08/25 17:50:26 uwe Exp $");
 
 #include "opt_kgdb.h"
-#include "opt_rcons.h"
 #include "fb.h"
 
 #include <sys/param.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc/sparc/autoconf.c
--- a/sys/arch/sparc/sparc/autoconf.c   Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc/sparc/autoconf.c   Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.199 2003/08/24 17:32:01 uwe Exp $ */
+/*     $NetBSD: autoconf.c,v 1.200 2003/08/25 17:50:26 uwe Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,12 +48,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.199 2003/08/24 17:32:01 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.200 2003/08/25 17:50:26 uwe Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
-#include "opt_rcons.h"
 #include "opt_sparc_arch.h"
 
 #include "scsibus.h"
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc64/dev/kd.c
--- a/sys/arch/sparc64/dev/kd.c Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc64/dev/kd.c Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kd.c,v 1.28 2003/08/24 17:32:02 uwe Exp $      */
+/*     $NetBSD: kd.c,v 1.29 2003/08/25 17:50:27 uwe Exp $      */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,9 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.28 2003/08/24 17:32:02 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.29 2003/08/25 17:50:27 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c       Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c       Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.80 2003/08/24 17:32:03 uwe Exp $ */
+/*     $NetBSD: autoconf.c,v 1.81 2003/08/25 17:50:27 uwe Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,11 +48,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.80 2003/08/24 17:32:03 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.81 2003/08/25 17:50:27 uwe Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_rcons.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/arch/sun2/dev/kd.c
--- a/sys/arch/sun2/dev/kd.c    Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/arch/sun2/dev/kd.c    Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kd.c,v 1.7 2003/08/24 17:32:04 uwe Exp $       */
+/*     $NetBSD: kd.c,v 1.8 2003/08/25 17:50:28 uwe Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,9 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.7 2003/08/24 17:32:04 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.8 2003/08/25 17:50:28 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff -r d46e83908932 -r 4a19ef942871 sys/dev/rcons/files.rcons
--- a/sys/dev/rcons/files.rcons Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/dev/rcons/files.rcons Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.rcons,v 1.11 2003/08/24 17:36:32 uwe Exp $
+# $NetBSD: files.rcons,v 1.12 2003/08/25 17:50:22 uwe Exp $
 #
 # Configuration file for RASTER Console.
 #
@@ -8,6 +8,5 @@
 file dev/rcons/rcons_kern.c    rasterconsole
 file dev/rcons/rcons_subr.c    rasterconsole
 
-defflag opt_rcons.h    RASTERCONSOLE
-defflag opt_rcons.h    RCONS_2BPP RCONS_4BPP RCONS_16BPP
 defparam opt_rcons.h   RASTERCONSOLE_FGCOL RASTERCONSOLE_BGCOL 
+defflag        opt_rcons.h     RCONS_2BPP RCONS_4BPP RCONS_16BPP
diff -r d46e83908932 -r 4a19ef942871 sys/dev/sbus/p9100.c
--- a/sys/dev/sbus/p9100.c      Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/dev/sbus/p9100.c      Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: p9100.c,v 1.17 2003/08/24 17:32:04 uwe Exp $ */
+/*     $NetBSD: p9100.c,v 1.18 2003/08/25 17:50:29 uwe Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,9 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.17 2003/08/24 17:32:04 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.18 2003/08/25 17:50:29 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/dev/sbus/zx.c
--- a/sys/dev/sbus/zx.c Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/dev/sbus/zx.c Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zx.c,v 1.9 2003/08/24 17:32:05 uwe Exp $       */
+/*     $NetBSD: zx.c,v 1.10 2003/08/25 17:50:29 uwe Exp $      */
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -52,9 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.9 2003/08/24 17:32:05 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.10 2003/08/25 17:50:29 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/dev/sun/bt_subr.c
--- a/sys/dev/sun/bt_subr.c     Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/dev/sun/bt_subr.c     Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bt_subr.c,v 1.6 2003/08/24 17:32:05 uwe Exp $ */
+/*     $NetBSD: bt_subr.c,v 1.7 2003/08/25 17:50:29 uwe Exp $ */
 
 /*
  * Copyright (c) 1993
@@ -41,9 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.6 2003/08/24 17:32:05 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.7 2003/08/25 17:50:29 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/dev/sun/bwtwo.c
--- a/sys/dev/sun/bwtwo.c       Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/dev/sun/bwtwo.c       Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bwtwo.c,v 1.10 2003/08/24 17:32:05 uwe Exp $ */
+/*     $NetBSD: bwtwo.c,v 1.11 2003/08/25 17:50:29 uwe Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -86,9 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.10 2003/08/24 17:32:05 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.11 2003/08/25 17:50:29 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r d46e83908932 -r 4a19ef942871 sys/dev/sun/cgsix.c
--- a/sys/dev/sun/cgsix.c       Mon Aug 25 16:38:55 2003 +0000
+++ b/sys/dev/sun/cgsix.c       Mon Aug 25 17:50:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix.c,v 1.14 2003/08/24 17:32:06 uwe Exp $ */
+/*     $NetBSD: cgsix.c,v 1.15 2003/08/25 17:50:29 uwe Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,9 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.14 2003/08/24 17:32:06 uwe Exp $");
-
-#include "opt_rcons.h"
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.15 2003/08/25 17:50:29 uwe Exp $");