unify

2 files changed, 2 insertions, 79 deletions

diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 47cf56c9d40..2b7a81ba95c 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.38 2000/11/16 15:47:56 jason Exp $
+#	$OpenBSD: files.sparc,v 1.39 2001/05/11 06:41:48 deraadt Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -92,7 +92,7 @@ major { vnd = 8 }
 major { cd = 18 }
 
 # RAM Disk for install floppy
-file arch/sparc/sparc/rd_root.c		ramdisk_hooks
+file dev/rd.c					ramdisk_hooks
 major	{rd = 17}
 
 device dma {}
diff --git a/sys/arch/sparc/sparc/rd_root.c b/sys/arch/sparc/sparc/rd_root.c
deleted file mode 100644
index ab44958b3d4..00000000000
--- a/sys/arch/sparc/sparc/rd_root.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$OpenBSD: rd_root.c,v 1.3 1998/07/19 16:08:18 deraadt Exp $	*/
-/*	$NetBSD: rd_root.c,v 1.2 1996/03/27 16:38:33 perry Exp $	*/
-
-/*
- * Copyright (c) 1995 Gordon W. Ross
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/reboot.h>
-
-#include <dev/ramdisk.h>
-
-extern int boothowto;
-
-#ifndef MINIROOTSIZE
-#define MINIROOTSIZE 512
-#endif
-
-#define ROOTBYTES (MINIROOTSIZE << DEV_BSHIFT)
-
-/*
- * This array will be patched to contain a file-system image.
- * See the program:  src/distrib/sun3/common/rdsetroot.c
- */
-int rd_root_size = ROOTBYTES;
-char rd_root_image[ROOTBYTES] = "|This is the root ramdisk!\n";
-
-/*
- * This is called during autoconfig.
- */
-void
-rd_attach_hook(unit, rd)
-	int unit;
-	struct rd_conf *rd;
-{
-	if (unit == 0) {
-		/* Setup root ramdisk */
-		rd->rd_addr = (caddr_t) rd_root_image;
-		rd->rd_size = (size_t)  rd_root_size;
-		rd->rd_type = RD_KMEM_FIXED;
-		printf("rd%d: fixed, %d blocks\n", unit, MINIROOTSIZE);
-	}
-}
-
-/*
- * This is called during open (i.e. mountroot)
- */
-void
-rd_open_hook(unit, rd)
-	int unit;
-	struct rd_conf *rd;
-{
-}