unify rd(4) even more

9 files changed, 10 insertions, 35 deletions

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 9a4ce881376..2619e306997 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.84 2001/05/11 06:41:35 deraadt Exp $
+#	$OpenBSD: files.i386,v 1.85 2001/05/11 07:13:15 deraadt Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -58,9 +58,6 @@ include "../../../scsi/files.scsi"
 major	{sd = 4}
 major	{st = 5}
 major	{cd = 6}
-
-# RAM Disk for install floppy
-file dev/rd.c				ramdisk_hooks
 major	{rd = 17}
 
 #
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index c3f508dcd73..ee31c21bf92 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mac68k,v 1.22 2001/05/11 06:41:42 deraadt Exp $
+#	$OpenBSD: files.mac68k,v 1.23 2001/05/11 07:13:15 deraadt Exp $
 #	$NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $
 
 # mac68k-specific configuration info
@@ -127,9 +127,6 @@ file	arch/mac68k/mac68k/vm_machdep.c
 file	dev/cons.c
 file	dev/cninit.c
 
-# RAM Disk for boot tape
-file	dev/rd.c				ramdisk_hooks
-
 major	{sd = 4}
 major	{st = 5}
 major	{cd = 6}
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 4ec53686e30..9e32eae6dae 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.17 2001/05/11 06:41:43 deraadt Exp $
+#	$OpenBSD: files.mvme68k,v 1.18 2001/05/11 07:13:15 deraadt Exp $
 
 # config file for mvme68k
 
@@ -97,9 +97,6 @@ device lptwo
 attach lptwo at pcctwo
 file	arch/mvme68k/dev/lptwo.c		lptwo needs-count
 
-# RAM disk for boot tape
-file dev/rd.c					ramdisk_hooks
-
 device xdc {target = -1}
 attach xdc at vmes
 device xd: disk
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index 09fe0e838a2..8f9c433a1b2 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.9 2001/05/11 06:41:45 deraadt Exp $
+#	$OpenBSD: files.mvme88k,v 1.10 2001/05/11 07:13:15 deraadt Exp $
 #	
 maxpartitions 16
 
@@ -78,9 +78,6 @@ file	arch/mvme88k/dev/vme.c			vme | vmes | vmel
 file	arch/mvme88k/dev/vmes.c			vmes needs-count
 file	arch/mvme88k/dev/vmel.c			vmel needs-count
 
-#ramdisk support
-file 	dev/rd.c				ramdisk_hooks
-
 # list of standard files
 file	dev/cons.c					ite | ser | tty
 file	dev/cninit.c
diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index 04790b39e2e..580939479de 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pmax,v 1.14 2001/05/11 06:41:46 deraadt Exp $
+#	$OpenBSD: files.pmax,v 1.15 2001/05/11 07:13:15 deraadt Exp $
 #	$NetBSD: files.pmax,v 1.36 1996/10/13 05:28:48 jonathan Exp $
 # DECstation-specific configuration info
 
@@ -64,9 +64,6 @@ include "../../../scsi/files.scsi"
 #major { sd = 21 }
 major { tz = 10 }
 major { rz = 21 }
-
-# RAM Disk for install floppy
-file	dev/rd.c			ramdisk_hooks
 major { rd = 25 }
 
 #
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 9aa3874c66e..0051554dc2b 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -72,9 +72,6 @@ major	{ ofdisk = 4 }
 
 file	arch/powerpc/mac/uni_n.c ofbus
 
-file	dev/rd.c				ramdisk_hooks
-major   {rd = 17}
-
 include "dev/pci/files.pci"
 
 device	mpcpcibr {} : pcibus
@@ -82,9 +79,10 @@ attach	mpcpcibr at mainbus
 file	arch/powerpc/pci/mpcpcibus.c		mpcpcibr
 #file	arch/powerpc/pci/pci_addr_fixup.c	mpcpcibr
 
-
+major   {rd = 17}
 major	{sd = 2}		# hey this was 0 but at slot 2 in bdevsw XXX
 major	{cd = 3}
+
 include "../../../scsi/files.scsi"
 
 #
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 2b7a81ba95c..7b9a04b72dd 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.39 2001/05/11 06:41:48 deraadt Exp $
+#	$OpenBSD: files.sparc,v 1.40 2001/05/11 07:13:16 deraadt Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -90,9 +90,6 @@ include "../../../scsi/files.scsi"
 major { sd = 7 }
 major { vnd = 8 }
 major { cd = 18 }
-
-# RAM Disk for install floppy
-file dev/rd.c					ramdisk_hooks
 major	{rd = 17}
 
 device dma {}
diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3
index b9121b8ec9b..111807ed987 100644
--- a/sys/arch/sun3/conf/files.sun3
+++ b/sys/arch/sun3/conf/files.sun3
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sun3,v 1.16 2001/05/11 06:41:49 deraadt Exp $
+#	$OpenBSD: files.sun3,v 1.17 2001/05/11 07:13:16 deraadt Exp $
 #	$NetBSD: files.sun3,v 1.26 1996/10/29 19:58:14 gwr Exp $
 
 #
@@ -176,10 +176,6 @@ device ms: zsevent
 attach ms at zsc
 file arch/sun3/dev/ms.c			ms needs-flag
 
-
-# RAM Disk for boot tape
-file dev/rd.c				ramdisk_hooks
-
 # Major numbers for root/swap device configuration
 major	{xy=3}	# Xylogics 450 and 451
 major	{vnd=5}	# vnode pseudo-device
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 166f5446937..b74ad477580 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.vax,v 1.22 2001/05/11 06:41:51 deraadt Exp $
+#	$OpenBSD: files.vax,v 1.23 2001/05/11 07:13:16 deraadt Exp $
 #       $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
@@ -127,7 +127,6 @@ attach	ry at hdc
 major	{ry = 24}
 
 # RAM Disk for install floppy
-file	dev/rd.c			ramdisk_hooks
 major	{rd = 23}
 
 #