Make all file-system (MFS, FFS, NFS, LFS, DEVFS) related option new-style.

This introduce an xxxFS_BOOT for each of the rootable filesystems.
(Presently not required, but encouraged to allow a smooth move of option *FS
to opt_dontuse.h later.)

LFS is temporarily disabled, and will be re-enabled tomorrow.

18 files changed, 40 insertions, 14 deletions

diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 38ae10a..17fba20 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -209,6 +209,7 @@
 
 #ifdef __FreeBSD__
 #include "bktr.h"
+#include "opt_devfs.h"
 #include "pci.h"
 #endif /* __FreeBSD__ */
 
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 8b243be..bb78e29 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,10 +27,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.58 1997/12/16 17:39:59 eivind Exp $
+ *	$Id: cy.c,v 1.59 1997/12/28 06:23:03 bde Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "cy.h"
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 8b243be..bb78e29 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,10 +27,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.58 1997/12/16 17:39:59 eivind Exp $
+ *	$Id: cy.c,v 1.59 1997/12/28 06:23:03 bde Exp $
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "cy.h"
 
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 1ae4754..cf98b7e 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.29 1997/12/06 13:22:03 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.30 1997/12/16 17:39:57 eivind Exp $
  *
  *  Digiboard driver.
  *
@@ -28,6 +28,7 @@
  */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include "dgb.h"
 
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index d31c643..c179222 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $
+ *	$Id: fd.c,v 1.106 1997/12/02 21:06:21 phk Exp $
  *
  */
 
@@ -52,6 +52,7 @@
 #undef NFDC
 #endif
 #include "fd.h"
+#include "opt_devfs.h"
 #include "opt_fdc.h"
 
 #if NFDC > 0
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index ee50044..84682a9 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -30,6 +30,8 @@
 
 #if NJOY > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 35439a5..9121a71 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,12 +40,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.95 1997/11/07 08:52:40 phk Exp $
+ *	$Id: mcd.c,v 1.96 1997/12/02 21:06:25 phk Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 01b285b..2f558d8 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.35 1997/11/18 11:30:10 bde Exp $
+ * $Id: mse.c,v 1.36 1997/12/07 08:09:16 yokota Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -46,6 +46,8 @@
 
 #include "mse.h"
 #if NMSE > 0
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index f94498d..6ecd4b7 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,13 +23,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.79 1997/09/14 03:19:36 peter Exp $
+ * $Id: pci.c,v 1.80 1997/11/07 08:53:28 phk Exp $
  *
  */
 
 #include "pci.h"
 #if NPCI > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c
index e82b4f4..46a1ea1 100644
--- a/sys/dev/ppbus/nlpt.c
+++ b/sys/dev/ppbus/nlpt.c
@@ -47,7 +47,7 @@
  *
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: nlpt.c,v 1.5 1997/08/29 00:30:11 msmith Exp $
+ *	$Id: nlpt.c,v 1.6 1997/12/02 21:06:09 phk Exp $
  */
 
 /*
@@ -62,6 +62,8 @@
 
 
 #ifdef KERNEL
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 8d1e298..2779bbf 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -34,6 +34,8 @@
 
 #if NRC > 0
 
+#include "opt_devfs.h"
+
 /*#define RCDEBUG*/
 
 #include <sys/param.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 1d97b12..bdc1c15 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.33 1997/09/21 21:41:32 gibbs Exp $ */
+/* $Id: scd.c,v 1.34 1997/12/02 21:06:26 phk Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -49,6 +49,7 @@
 
 #include "scd.h"
 #if NSCD > 0
+#include "opt_devfs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index f71871e..2ade5e1 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.62 1997/12/06 13:22:56 bde Exp $
+ *	$Id: si.c,v 1.63 1997/12/16 17:40:03 eivind Exp $
  */
 
 #ifndef lint
@@ -40,6 +40,7 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #endif	/* not lint */
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 8c9b71d..922d93b 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.193 1997/12/28 06:36:35 bde Exp $
+ *	$Id: sio.c,v 1.194 1998/01/08 04:53:43 amurai Exp $
  */
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_sio.h"
 #include "sio.h"
 #include "pnp.h"
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 55db19f..7bfb635 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -18,6 +18,7 @@
 #if NSNP > 0
 
 #include "opt_compat.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 780b440..4b813ca 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,13 +4,15 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.29 1997/02/22 09:37:11 peter Exp $
+ *    $Id: spkr.c,v 1.30 1997/12/02 21:06:28 phk Exp $
  */
 
 #include "speaker.h"
 
 #if NSPEAKER > 0
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 493cec7..1c07a09 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.245 1998/01/12 03:28:36 julian Exp $
+ *  $Id: syscons.c,v 1.246 1998/01/20 03:37:27 yokota Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 #include "opt_syscons.h"
 
 #if NSC > 0
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index ac44f70..82bb632 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.51 1997/10/21 09:51:47 kato Exp $
+ *	$Id: vn.c,v 1.52 1997/12/06 14:27:08 bde Exp $
  */
 
 /*
@@ -68,6 +68,8 @@
 #define	NVN	8
 #endif
 
+#include "opt_devfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>