diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-02-03 11:37:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-02-03 11:37:38 +0000 |
| commit | 0cdb7e6812aac4f69da7e59c40fc8b7571a9e038 (patch) | |
| tree | 199e627434d5e8b92d9be3014173edc0c7551cb6 /sys | |
| parent | 9a8803f023478f029f36ef0ca11d0d586e79fc53 (diff) | |
use dk_mountroot
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amiga/amiga/swapgeneric.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c index 4fad803d30d..f337e5757ad 100644 --- a/sys/arch/amiga/amiga/swapgeneric.c +++ b/sys/arch/amiga/amiga/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.7 1997/01/16 09:23:28 niklas Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.8 1997/02/03 11:37:37 deraadt Exp $ */ /* $NetBSD: swapgeneric.c,v 1.26 1996/10/13 03:06:40 christos Exp $ */ /* @@ -55,12 +55,7 @@ #include "cd.h" #include "acd.h" -#if NCD + NACD > 0 -#include <sys/mount.h> -#include <isofs/cd9660/iso.h> -#endif -#include <ufs/ffs/ffs_extern.h> -int (*mountroot) __P((void)) = ffs_mountroot; +int (*mountroot) __P((void)) = dk_mountroot; void gets __P((char *)); @@ -220,10 +215,6 @@ setconf() found: gc->gc_root = MAKEDISKDEV(major(gc->gc_root), unit, 0); rootdev = gc->gc_root; -#if NCD > 0 - if (major(rootdev) == 7) - mountroot = cd9660_mountroot; -#endif justdoswap: swdevt[0].sw_dev = dumpdev = MAKEDISKDEV(major(rootdev), |