From 6cce9950196b48f975c8457fecbbcf4bc62890b6 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <joerg@FreeBSD.org>
Date: Mon, 22 Sep 1997 21:24:03 +0000
Subject: [PATCH] Make MFS a supported option, finally.

---
 sys/conf/options               | 3 ++-
 sys/gnu/ext2fs/ext2_mount.h    | 4 +---
 sys/gnu/fs/ext2fs/ext2_mount.h | 4 +---
 sys/ufs/ufs/ufsmount.h         | 4 +---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys/conf/options b/sys/conf/options
index 2b035a8ca97..058add5e7b1 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.33 1997/09/10 03:07:12 peter Exp $
+#	$Id: options,v 1.34 1997/09/16 18:35:56 joerg Exp $
 
 # Format:
 # Option name	filename
@@ -25,6 +25,7 @@ INCLUDE_CONFIG_FILE	opt_config.h
 # options in a never-included header.
 FDESC		opt_dontuse.h
 KERNFS		opt_dontuse.h
+MFS		opt_dontuse.h
 NULLFS		opt_dontuse.h
 PORTAL		opt_dontuse.h
 PROCFS		opt_dontuse.h
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 8c25f03ac40..168748afefc 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id$
+ * $Id: ufsmount.h,v 1.7 1997/02/22 09:47:54 peter Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
@@ -45,7 +45,6 @@ struct ufs_args {
 	struct	export_args export;	/* network export information */
 };
 
-#ifdef MFS
 /*
  * Arguments to mount MFS
  */
@@ -55,7 +54,6 @@ struct mfs_args {
 	caddr_t	base;			/* base of file system in memory */
 	u_long	size;			/* size of file system */
 };
-#endif /* MFS */
 
 #ifdef KERNEL
 struct buf;
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 8c25f03ac40..168748afefc 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id$
+ * $Id: ufsmount.h,v 1.7 1997/02/22 09:47:54 peter Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
@@ -45,7 +45,6 @@ struct ufs_args {
 	struct	export_args export;	/* network export information */
 };
 
-#ifdef MFS
 /*
  * Arguments to mount MFS
  */
@@ -55,7 +54,6 @@ struct mfs_args {
 	caddr_t	base;			/* base of file system in memory */
 	u_long	size;			/* size of file system */
 };
-#endif /* MFS */
 
 #ifdef KERNEL
 struct buf;
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 8c25f03ac40..168748afefc 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id$
+ * $Id: ufsmount.h,v 1.7 1997/02/22 09:47:54 peter Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
@@ -45,7 +45,6 @@ struct ufs_args {
 	struct	export_args export;	/* network export information */
 };
 
-#ifdef MFS
 /*
  * Arguments to mount MFS
  */
@@ -55,7 +54,6 @@ struct mfs_args {
 	caddr_t	base;			/* base of file system in memory */
 	u_long	size;			/* size of file system */
 };
-#endif /* MFS */
 
 #ifdef KERNEL
 struct buf;