diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 6a6b2e0ad04e..40f905e98ec4 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.9 1995/08/17 17:40:42 thorpej Exp $	*/
+/*	$NetBSD: conf.c,v 1.10 1996/03/14 21:20:59 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -103,7 +103,7 @@ cdev_decl(tun);
 cdev_decl(sd);
 cdev_decl(vnd);
 cdev_decl(ccd);
-dev_type_open(fdopen);
+dev_type_open(filedescopen);
 #include "bpfilter.h"
 cdev_decl(bpf);
 cdev_decl(st);
@@ -139,7 +139,7 @@ struct cdevsw	cdevsw[] =
 	cdev_bpftun_init(NTUN,tun),	/* 7: network tunnel */
 	cdev_disk_init(NSD,sd),		/* 8: SCSI disk */
 	cdev_disk_init(NVND,vnd),	/* 9: vnode disk driver */
-	cdev_fd_init(1,fd),		/* 10: file descriptor pseudo-dev */
+	cdev_fd_init(1,filedesc),	/* 10: file descriptor pseudo-dev */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 11: Berkeley packet filter */
 	cdev_tape_init(NST,st),		/* 12: SCSI tape */
 	cdev_disk_init(NCD,cd),		/* 13: SCSI CD-ROM */
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c
index a23e9a2b5814..aac5866f131e 100644
--- a/sys/arch/amiga/amiga/conf.c
+++ b/sys/arch/amiga/amiga/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.32 1995/09/30 01:52:37 chopps Exp $	*/
+/*	$NetBSD: conf.c,v 1.33 1996/03/14 21:22:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -154,7 +154,7 @@ cdev_decl(fd);
 cdev_decl(vnd);
 cdev_decl(ccd);
 cdev_decl(st);
-dev_decl(fd,open);
+dev_decl(filedesc,open);
 #include "bpfilter.h"
 cdev_decl(bpf);
 #include "tun.h"
@@ -191,7 +191,7 @@ struct cdevsw	cdevsw[] =
 #undef	fdopen
 	cdev_disk_init(NVND,vnd),	/* 19: vnode disk driver */
 	cdev_tape_init(NST,st),		/* 20: SCSI tape */
-	cdev_fd_init(1,fd),		/* 21: file descriptor pseudo-dev */
+	cdev_fd_init(1,filedesc),	/* 21: file descriptor pseudo-dev */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 22: Berkeley packet filter */
 	cdev_bpftun_init(NTUN,tun),	/* 23: network tunnel */
 	cdev_lkm_init(NLKM,lkm),	/* 24: loadable module driver */
diff --git a/sys/arch/arm32/arm32/conf.c b/sys/arch/arm32/arm32/conf.c
index a9fb5a827377..947207e6bd02 100644
--- a/sys/arch/arm32/arm32/conf.c
+++ b/sys/arch/arm32/arm32/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.2 1996/03/13 20:55:21 mark Exp $ */
+/* $NetBSD: conf.c,v 1.3 1996/03/14 21:23:39 christos Exp $ */
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -222,7 +222,7 @@ cdev_decl(lpt);
 #define fdopen  Fdopen
 cdev_decl(fd);
 #undef  fdopen
-dev_decl(fd,open);
+dev_decl(filedesc,open);
 cdev_decl(rd);
 #include "bpfilter.h"
 cdev_decl(bpf);
@@ -297,7 +297,7 @@ struct cdevsw cdevsw[] = {
 	cdev_lkm_dummy(),		/* 31 */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 32: Berkeley packet filter */
         cdev_bpftun_init(NTUN,tun),     /* 33: network tunnel */
-        cdev_fd_init(1,fd),             /* 34: file descriptor pseudo-device */
+        cdev_fd_init(1,filedesc),       /* 34: file descriptor pseudo-device */
 	cdev_lkm_init(NLKM,lkm),        /* 35: loadable module driver */
 	cdev_audio_init(NAUDIO,audio),	/* 36: generic audio I/O */
 	cdev_vidcvid_init(1,vidcvideo),	/* 37: vidcvideo device */
diff --git a/sys/arch/atari/atari/conf.c b/sys/arch/atari/atari/conf.c
index 6147c2b07984..8d5bc52c2ee9 100644
--- a/sys/arch/atari/atari/conf.c
+++ b/sys/arch/atari/atari/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.11 1995/11/30 00:57:33 jtc Exp $	*/
+/*	$NetBSD: conf.c,v 1.12 1996/03/14 21:24:40 christos Exp $	*/
 
 /*
  * Copyright (c) 1991 The Regents of the University of California.
@@ -147,7 +147,7 @@ cdev_decl(fd);
 #undef	fdopen
 cdev_decl(vnd);
 cdev_decl(ccd);
-dev_decl(fd,open);
+dev_decl(filedesc,open);
 #include "bpfilter.h"
 cdev_decl(bpf);
 #include "tun.h"
@@ -181,7 +181,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NFD,fd),		/* 16: floppy disk */
 #undef	fdopen
 	cdev_disk_init(NVND,vnd),	/* 17: vnode disk driver */
-	cdev_fd_init(1,fd),		/* 18: file descriptor pseudo-device */
+	cdev_fd_init(1,filedesc),	/* 18: file descriptor pseudo-device */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 19: Berkeley packet filter */
 	cdev_lkm_init(NLKM,lkm),	/* 20: loadable module driver */
 	cdev_lkm_dummy(),		/* 21 */
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 0ef2473551c3..0485a2de7a46 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.30 1996/02/24 00:55:36 thorpej Exp $	*/
+/*	$NetBSD: conf.c,v 1.31 1996/03/14 21:26:28 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -140,6 +140,7 @@ cdev_decl(ccd);
 cdev_decl(vnd);
 cdev_decl(st);
 cdev_decl(fd);
+dev_decl(filedesc,open);
 #include "bpfilter.h"
 cdev_decl(bpf);
 #include "tun.h"
@@ -174,7 +175,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 18 */
 	cdev_disk_init(NVND,vnd),	/* 19: vnode disk driver */
 	cdev_tape_init(NST,st),		/* 20: SCSI tape */
-	cdev_fd_init(1,fd),		/* 21: file descriptor pseudo-device */
+	cdev_fd_init(1,filedesc),	/* 21: file descriptor pseudo-device */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 22: Berkeley packet filter */
 	cdev_bpftun_init(NTUN,tun),	/* 23: network tunnel */
 	cdev_lkm_init(NLKM,lkm),	/* 24: loadable module driver */
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index e650cbd759d0..9c07c5027097 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.70 1996/02/22 05:53:23 scottr Exp $	*/
+/*	$NetBSD: conf.c,v 1.71 1996/03/14 21:27:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -152,7 +152,7 @@ cdev_decl(cd);
 cdev_decl(lpt);
 #include "ch.h"
 cdev_decl(ch);
-dev_decl(fd,open);
+dev_decl(filedesc,open);
 #include "bpfilter.h"
 cdev_decl(bpf);
 #include "spkr.h"
@@ -206,7 +206,7 @@ struct cdevsw	cdevsw[] =
 	cdev_ss_init(NSS,ss),		/* 19: SCSI scanner */
 	cdev_notdef(),			/* 20 */
 	cdev_notdef(),			/* 21 */
-	cdev_fd_init(1,fd),		/* 22: file descriptor pseudo-device */
+	cdev_fd_init(1,filedesc),	/* 22: file descriptor pseudo-device */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */
 	cdev_notdef(),			/* 24 */
 	cdev_notdef(),			/* 25 */
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 84ac08fa8b87..5f125d9ebe2b 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.29 1995/11/21 03:39:45 briggs Exp $	*/
+/*	$NetBSD: conf.c,v 1.30 1996/03/14 21:28:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -169,6 +169,7 @@ cdev_decl(ccd);
 cdev_decl(bpf);
 #include "tun.h"
 cdev_decl(tun);
+dev_decl(filedesc,open);
 
 #ifdef LKM
 #define NLKM	1
@@ -202,7 +203,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 18 */
 	cdev_disk_init(NVND,vnd),	/* 19: vnode disk driver */
 	cdev_disk_init(NCCD,ccd),	/* 20: concatenated disk driver */
-	cdev_fd_init(1,fd),		/* 21: file descriptor pseudo-device */
+	cdev_fd_init(1,filedesc),	/* 21: file descriptor pseudo-device */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 22: Berkeley packet filter */
 	cdev_mouse_init(NADB,adb),	/* 23: ADB event interface */
 	cdev_bpftun_init(NTUN,tun),	/* 24: network tunnel */
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 513db413e645..5251b33a92c0 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.2 1995/08/17 17:40:54 thorpej Exp $	*/
+/*	$NetBSD: conf.c,v 1.3 1996/03/14 21:29:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -112,6 +112,8 @@ cdev_decl(st);
 cdev_decl(vnd);
 cdev_decl(ccd);
 
+dec_decl(filedesc,open);
+
 #include "bpfilter.h"
 cdev_decl(bpf);
 
@@ -147,7 +149,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 18 */
 	cdev_disk_init(NVND,vnd),	/* 19: vnode disk */
 	cdev_tape_init(NST,st),		/* 20: SCSI tape */
-	cdev_fd_init(1,fd),		/* 21: file descriptor pseudo-dev */
+	cdev_fd_init(1,filedesc),	/* 21: file descriptor pseudo-dev */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 22: berkeley packet filter */
 	cdev_bpftun_init(NTUN,tun),	/* 23: network tunnel */
 	cdev_lkm_init(NLKM,lkm),	/* 24: loadable module driver */
diff --git a/sys/arch/pc532/pc532/conf.c b/sys/arch/pc532/pc532/conf.c
index 6898e20f64b9..a2deae6e1795 100644
--- a/sys/arch/pc532/pc532/conf.c
+++ b/sys/arch/pc532/pc532/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.26 1995/09/26 20:16:25 phil Exp $	*/
+/*	$NetBSD: conf.c,v 1.27 1996/03/14 21:30:37 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -98,6 +98,7 @@ cdev_decl(scn);
 cdev_decl(rd);
 cdev_decl(st);
 cdev_decl(fd);
+dev_decl(filedesc,open);
 cdev_decl(cd);
 cdev_decl(vnd);
 cdev_decl(ccd);
@@ -121,7 +122,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NSCN,scn),	/* 8: serial ports */
 	cdev_disk_init(NRD,rd),		/* 9: RAM disk */
 	cdev_tape_init(NST,st),		/* 10: SCSI tape */
-	cdev_fd_init(1,fd),		/* 11: file descriptor pseudo-device */
+	cdev_fd_init(1,filedesc),	/* 11: file descriptor pseudo-device */
 	cdev_disk_init(NCD,cd),		/* 12: SCSI CD-ROM */
 	cdev_disk_init(NVND,vnd),	/* 13: vnode disk driver */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 14: Berkeley packet filter */