summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-03-19 21:58:54 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-03-19 21:58:54 +0000
commitb3a5f9a84c8bf8778405d381b384153ba27f4970 (patch)
treebbf939fc46f97a2ffc4e4d212e60eab40abaf931 /sys
parentd9246087025e99fba50d0bb34e7b612f743747a2 (diff)
mountroot for disk devices shall be dk_mountroot(), not ffs_mountroot().
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mac68k/mac68k/autoconf.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/arch/mac68k/mac68k/autoconf.c b/sys/arch/mac68k/mac68k/autoconf.c
index 3cd0121984b..37c8900c0a8 100644
--- a/sys/arch/mac68k/mac68k/autoconf.c
+++ b/sys/arch/mac68k/mac68k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.25 2006/01/18 23:21:17 miod Exp $ */
+/* $OpenBSD: autoconf.c,v 1.26 2006/03/19 21:58:53 miod Exp $ */
/* $NetBSD: autoconf.c,v 1.38 1996/12/18 05:46:09 scottr Exp $ */
/*
@@ -57,7 +57,6 @@
#include <sys/reboot.h>
#include <sys/device.h>
#include <sys/disk.h>
-#include <sys/lock.h>
#include <dev/cons.h>
@@ -67,10 +66,6 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ffs/ffs_extern.h>
-
struct device *booted_device;
int booted_partition;
@@ -370,7 +365,7 @@ gotswap:
return;
#endif
case DV_DISK:
- mountroot = ffs_mountroot;
+ mountroot = dk_mountroot;
printf("root on %s%c", rootdv->dv_xname,
DISKPART(rootdev) + 'a');
if (nswapdev != NODEV)