cdev_decl cleanup; jason@ ok

10 files changed, 12 insertions, 37 deletions

diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index 7465134d331..da78add7781 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.16 1999/12/08 01:35:44 jason Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.17 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
 
 /*
@@ -109,9 +109,6 @@ static void	bwtwounblank __P((struct device *));
 static void	bwtwo_set_video __P((struct bwtwo_softc *, int));
 static int	bwtwo_get_video __P((struct bwtwo_softc *));
 
-/* cdevsw prototypes */
-cdev_decl(bwtwo);
-
 struct cfattach bwtwo_ca = {
 	sizeof(struct bwtwo_softc), bwtwomatch, bwtwoattach
 };
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index 20843f89697..bfc361f659b 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgeight.c,v 1.9 1998/11/20 15:57:21 deraadt Exp $	*/
+/*	$OpenBSD: cgeight.c,v 1.10 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $	*/
 
 /*
@@ -95,9 +95,6 @@ static int	cgeightmatch(struct device *, void *, void *);
 static void	cgeightunblank __P((struct device *));
 #endif
 
-/* cdevsw prototypes */
-cdev_decl(cgeight);
-
 struct cfattach cgeight_ca = {
 	sizeof(struct cgeight_softc), cgeightmatch, cgeightattach
 };
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index 968a57fa69b..64252e2459e 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfour.c,v 1.9 1998/11/20 15:57:21 deraadt Exp $	*/
+/*	$OpenBSD: cgfour.c,v 1.10 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $	*/
 
 /*
@@ -99,9 +99,6 @@ static int	cgfourmatch __P((struct device *, void *, void *));
 static void	cgfourunblank __P((struct device *));
 #endif
 
-/* cdevsw prototypes */
-cdev_decl(cgfour);
-
 struct cfattach cgfour_ca = {
 	sizeof(struct cgfour_softc), cgfourmatch, cgfourattach
 };
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 79ae62f5b40..0c7dec4c72e 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfourteen.c,v 1.5 2001/05/10 10:34:43 art Exp $	*/
+/*	$OpenBSD: cgfourteen.c,v 1.6 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
 
 /*
@@ -105,9 +105,6 @@ static void	cgfourteenattach(struct device *, struct device *, void *);
 static int	cgfourteenmatch(struct device *, void *, void *);
 static void	cgfourteenunblank(struct device *);
 
-/* cdevsw prototypes */
-cdev_decl(cgfourteen);
-
 struct cfattach cgfourteen_ca = {
 	sizeof(struct cgfourteen_softc), cgfourteenmatch, cgfourteenattach
 };
diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index d6f9a6c4e0b..580f687c54b 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.14 2001/05/10 10:34:43 art Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.15 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */
 
 /*
@@ -126,9 +126,6 @@ static void	cgsixattach __P((struct device *, struct device *, void *));
 static int	cgsixmatch __P((struct device *, void *, void *));
 static void	cg6_unblank __P((struct device *));
 
-/* cdevsw prototypes */
-cdev_decl(cgsix);
-
 struct cfattach cgsix_ca = {
 	sizeof(struct cgsix_softc), cgsixmatch, cgsixattach
 };
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index a5026666090..7eb7195cf11 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.9 1999/09/10 23:32:02 art Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.10 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -94,9 +94,6 @@ static void	cgthreeattach(struct device *, struct device *, void *);
 static int	cgthreematch(struct device *, void *, void *);
 static void	cgthreeunblank(struct device *);
 
-/* cdevsw prototypes */
-cdev_decl(cgthree);
-
 struct cfattach cgthree_ca = {
 	sizeof(struct cgthree_softc), cgthreematch, cgthreeattach
 };
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index 17015c99929..226ac6dd77e 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwo.c,v 1.14 2001/04/06 04:42:05 csapuntz Exp $	*/
+/*	$OpenBSD: cgtwo.c,v 1.15 2001/08/17 13:52:28 mickey Exp $	*/
 /*	$NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
 
 /*
@@ -96,9 +96,6 @@ static void	cgtwounblank __P((struct device *));
 int		cgtwogetcmap __P((struct cgtwo_softc *, struct fbcmap *));
 int		cgtwoputcmap __P((struct cgtwo_softc *, struct fbcmap *));
 
-/* cdevsw prototypes */
-cdev_decl(cgtwo);
-
 struct cfattach cgtwo_ca = {
 	sizeof(struct cgtwo_softc), cgtwomatch, cgtwoattach
 };
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 466dff38066..78dbb603241 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.3 1999/09/07 02:58:49 jason Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.4 2001/08/17 13:52:29 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -83,9 +83,6 @@ void	p9100attach(struct device *, struct device *, void *);
 int	p9100match(struct device *, void *, void *);
 void	p9100unblank(struct device *);
 
-/* cdevsw prototypes */
-cdev_decl(p9100);
-
 struct cfattach pnozz_ca = {
 	sizeof(struct p9100_softc), p9100match, p9100attach
 };
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index a3c8fbfff8a..24e3c8be31d 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcx.c,v 1.2 1998/11/20 15:57:24 deraadt Exp $	*/
+/*	$OpenBSD: tcx.c,v 1.3 2001/08/17 13:52:29 mickey Exp $	*/
 /*	$NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
 
 /* 
@@ -108,9 +108,6 @@ static void	tcxattach __P((struct device *, struct device *, void *));
 static int	tcxmatch __P((struct device *, void *, void *));
 static void	tcx_unblank __P((struct device *));
 
-/* cdevsw prototypes */
-cdev_decl(tcx);
-
 struct cfattach tcx_ca = {
 	sizeof(struct tcx_softc), tcxmatch, tcxattach
 };
diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h
index bbcc407050c..c4ce8aaa295 100644
--- a/sys/arch/sparc/include/conf.h
+++ b/sys/arch/sparc/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.11 2001/06/27 06:23:28 angelos Exp $	*/
+/*	$OpenBSD: conf.h,v 1.12 2001/08/17 13:52:29 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $	*/
 
 /*
@@ -76,6 +76,8 @@ cdev_decl(tcx);
 
 cdev_decl(cgfourteen);
 
+cdev_decl(p9100);
+
 bdev_decl(xd);
 cdev_decl(xd);