summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1998-05-11 21:35:32 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1998-05-11 21:35:32 +0000
commitf64356158b432a132c8907afbb81c14afd53ae39 (patch)
tree0410e6e34420228d91d19027083ed366c24e847d
parent8c622b19bb64f78e53464158b3acbb2242dd5884 (diff)
s/ffs_mountroot/dk_mountroot/, name RD disks "hd" to not conflict
with the MI ramdisk device
-rw-r--r--sys/arch/vax/vax/swapgeneric.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/vax/vax/swapgeneric.c b/sys/arch/vax/vax/swapgeneric.c
index 84ec6bdaa30..8bb544dbb29 100644
--- a/sys/arch/vax/vax/swapgeneric.c
+++ b/sys/arch/vax/vax/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.5 1997/05/29 00:05:25 niklas Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.6 1998/05/11 21:35:31 niklas Exp $ */
/* $NetBSD: swapgeneric.c,v 1.13 1996/10/13 03:36:01 christos Exp $ */
/*-
@@ -45,8 +45,6 @@
#include <dev/cons.h>
-#include <ufs/ffs/ffs_extern.h>
-
#include <machine/pte.h>
#include <machine/mtpr.h>
#include <machine/cpu.h>
@@ -75,11 +73,11 @@ struct swdevt swdevt[] = {
long dumplo;
int dmmin, dmmax, dmtext;
-int (*mountroot) __P((void)) = ffs_mountroot;
+int (*mountroot) __P((void)) = dk_mountroot;
extern struct cfdriver hp_cd;
extern struct cfdriver ra_cd;
-extern struct cfdriver rd_cd;
+extern struct cfdriver hd_cd;
extern struct cfdriver sd_cd;
extern struct cfdriver st_cd;
@@ -94,7 +92,7 @@ struct ngcconf {
{ &ra_cd, makedev(9, 0), },
#endif
#if NHDC > 0
- { &rd_cd, makedev(19, 0), },
+ { &hd_cd, makedev(19, 0), },
#endif
#if NSD > 0
{ &sd_cd, makedev(20, 0), },