src - FreeBSD source tree

diff options


context:
space:
mode:

author	Eivind Eklund <eivind@FreeBSD.org>	1998-01-24 02:54:56 +0000
committer	Eivind Eklund <eivind@FreeBSD.org>	1998-01-24 02:54:56 +0000
commit	7b778b5e61910c0f18361e6f5e17ab0b6c5480f3 (patch)
tree	37324a07db4c415fcf6b7459dc8073aeb9355ca9 /sys/i386
parent	7f4ba7135504dcc12d161978438219a68976f07c (diff)

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.

Notes

Notes: svn path=/head/; revision=32726

Diffstat (limited to 'sys/i386')

-rw-r--r--

sys/i386/apm/apm.c

-rw-r--r--

sys/i386/bios/apm.c

-rw-r--r--

sys/i386/conf/GENERIC

-rw-r--r--

sys/i386/conf/LINT

-rw-r--r--

sys/i386/conf/NOTES

-rw-r--r--

sys/i386/i386/autoconf.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sys/i386/isa/matcd/matcd.c

-rw-r--r--

sys/i386/isa/mcd.c

-rw-r--r--

sys/i386/isa/mse.c

-rw-r--r--

sys/i386/isa/pcaudio.c

-rw-r--r--

sys/i386/isa/pcvt/pcvt_drv.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

sys/i386/isa/spigot.c

-rw-r--r--

sys/i386/isa/spkr.c

-rw-r--r--

sys/i386/isa/syscons.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

38 files changed, 111 insertions, 50 deletions

diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 59067c30378d..1f5e23963df3 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c

@@ -15,9 +15,11 @@

* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)

- * $Id: apm.c,v 1.66 1997/12/04 02:40:00 imp Exp $

+ * $Id: apm.c,v 1.67 1997/12/23 16:32:35 nate Exp $

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/conf.h>

#include <sys/kernel.h>

diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 59067c30378d..1f5e23963df3 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c

@@ -15,9 +15,11 @@

* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)

- * $Id: apm.c,v 1.66 1997/12/04 02:40:00 imp Exp $

+ * $Id: apm.c,v 1.67 1997/12/23 16:32:35 nate Exp $

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/conf.h>

#include <sys/kernel.h>

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index b83a5273acc6..c6a83cbe75e7 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC

@@ -11,7 +11,7 @@

# device lines is present in the ./LINT configuration file. If you are

# in doubt as to the purpose or necessity of a line, check first in LINT.

-# $Id: GENERIC,v 1.103 1998/01/16 22:12:58 pst Exp $

+# $Id: GENERIC,v 1.104 1998/01/21 18:34:44 jkh Exp $

machine "i386"

cpu "I386_CPU"

@@ -27,6 +27,9 @@ options FFS #Berkeley Fast Filesystem

options NFS #Network Filesystem

options MSDOSFS #MSDOS Filesystem

options "CD9660" #ISO 9660 Filesystem

+options "CD9660_ROOT" #CD-ROM usable as root device

+options FFS_ROOT #FFS usable as root device [keep this!]

+options NFS_ROOT #NFS usable as root device

options PROCFS #Process filesystem

options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]

options SCSI_DELAY=15 #Be pessimistic about Joe SCSI device

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7fbdf3d9f5d4..40a007a61cdf 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT

@@ -2,7 +2,7 @@

# LINT -- config file for checking all the sources, tries to pull in

# as much of the source tree as it can.

-# $Id: LINT,v 1.392 1998/01/16 22:12:59 pst Exp $

+# $Id: LINT,v 1.393 1998/01/21 18:34:47 jkh Exp $

# NB: You probably don't want to try running a kernel built from this

# file. Instead, you should start from GENERIC, and add options from

@@ -433,22 +433,17 @@ options TCPDEBUG

# They are included here as an incentive for some enterprising soul to

# sit down and fix them.

-# Note: 4.4BSD NQNFS lease checking has relatively high cost for

-# _local_ I/O as well as remote I/O. Don't use it unless you will

-# using NQNFS.

# One of these is mandatory:

options FFS #Fast filesystem

options NFS #Network File System

# The rest are optional:

-options NQNFS #Enable NQNFS lease checking

# options NFS_NOSERVER #Disable the NFS-server code.

options "CD9660" #ISO 9660 filesystem

options FDESC #File descriptor filesystem

options KERNFS #Kernel filesystem

-options LFS #Log filesystem

+#options LFS #Log filesystem

options MFS #Memory File System

options MSDOSFS #MS DOS File System

options NULLFS #NULL filesystem

@@ -456,6 +451,10 @@ options PORTAL #Portal filesystem

options PROCFS #Process filesystem

options UMAPFS #UID map filesystem

options UNION #Union filesystem

+options "CD9660_ROOT" #CD-ROM usable as root device

+options FFS_ROOT #FFS usable as root device

+#options LFS_ROOT #LFS usable as root device

+options NFS_ROOT #NFS usable as root device

# This DEVFS is experimental but seems to work

options DEVFS #devices filesystem

diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7fbdf3d9f5d4..40a007a61cdf 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES

@@ -2,7 +2,7 @@

# LINT -- config file for checking all the sources, tries to pull in

# as much of the source tree as it can.

-# $Id: LINT,v 1.392 1998/01/16 22:12:59 pst Exp $

+# $Id: LINT,v 1.393 1998/01/21 18:34:47 jkh Exp $

# NB: You probably don't want to try running a kernel built from this

# file. Instead, you should start from GENERIC, and add options from

@@ -433,22 +433,17 @@ options TCPDEBUG

# They are included here as an incentive for some enterprising soul to

# sit down and fix them.

-# Note: 4.4BSD NQNFS lease checking has relatively high cost for

-# _local_ I/O as well as remote I/O. Don't use it unless you will

-# using NQNFS.

# One of these is mandatory:

options FFS #Fast filesystem

options NFS #Network File System

# The rest are optional:

-options NQNFS #Enable NQNFS lease checking

# options NFS_NOSERVER #Disable the NFS-server code.

options "CD9660" #ISO 9660 filesystem

options FDESC #File descriptor filesystem

options KERNFS #Kernel filesystem

-options LFS #Log filesystem

+#options LFS #Log filesystem

options MFS #Memory File System

options MSDOSFS #MS DOS File System

options NULLFS #NULL filesystem

@@ -456,6 +451,10 @@ options PORTAL #Portal filesystem

options PROCFS #Process filesystem

options UMAPFS #UID map filesystem

options UNION #Union filesystem

+options "CD9660_ROOT" #CD-ROM usable as root device

+options FFS_ROOT #FFS usable as root device

+#options LFS_ROOT #LFS usable as root device

+options NFS_ROOT #NFS usable as root device

# This DEVFS is experimental but seems to work

options DEVFS #devices filesystem

diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 59919da7a311..a9dbc8526fb4 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c

@@ -34,7 +34,7 @@

* SUCH DAMAGE.

* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91

- * $Id: autoconf.c,v 1.82 1997/11/21 18:27:08 bde Exp $

+ * $Id: autoconf.c,v 1.83 1998/01/09 03:20:53 eivind Exp $

@@ -46,7 +46,11 @@

* and the drivers are initialized.

#include "opt_bootp.h"

+#include "opt_ffs.h"

#include "opt_cd9660.h"

+#include "opt_lfs.h"

+#include "opt_mfs.h"

+#include "opt_nfs.h"

#include <sys/param.h>

#include <sys/systm.h>

@@ -303,7 +307,7 @@ cpu_rootconf()

* XXX NetBSD has a much cleaner approach to finding root.

* XXX We should adopt their code.

-#ifdef CD9660

+#if defined(CD9660) || defined(CD9660_ROOT)

if ((boothowto & RB_CDROM)) {

if (bootverbose)

printf("Considering CD-ROM root f/s.\n");

@@ -340,7 +344,7 @@ cpu_rootconf()

mountrootfsname = "nfs";

}

#endif /* BOOTP_NFSROOT */

-#ifdef NFS

+#if defined(NFS) || defined(NFS_ROOT)

if (!mountrootfsname && nfs_diskless_valid) {

if (bootverbose)

printf("Considering NFS root f/s.\n");

@@ -348,7 +352,7 @@ cpu_rootconf()

}

#endif /* NFS */

-#ifdef FFS

+#if defined(FFS) || defined(FFS_ROOT)

if (!mountrootfsname) {

mountrootfsname = "ufs";

if (bootverbose)

@@ -366,7 +370,7 @@ cpu_rootconf()

}

#endif

-#ifdef LFS

+#if defined(LFS) || defined(LFS_ROOT)

if (!mountrootfsname) {

if (bootverbose)

printf("Considering LFS root f/s.\n");

diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 1da0188f2566..6cccc4fb6a7b 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c

@@ -36,9 +36,11 @@

* SUCH DAMAGE.

* from: @(#)cons.c 7.2 (Berkeley) 5/9/91

- * $Id: cons.c,v 1.54 1997/08/08 20:29:47 julian Exp $

+ * $Id: cons.c,v 1.55 1997/09/14 03:19:01 peter Exp $

+#include "opt_devfs.h"

#include <sys/param.h>

#ifdef DEVFS

#include <sys/devfsext.h>

diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 36a95145411b..bed81517c195 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c

@@ -38,13 +38,14 @@

* from: Utah $Hdr: mem.c 1.13 89/10/08$

* from: @(#)mem.c 7.2 (Berkeley) 5/9/91

- * $Id: mem.c,v 1.47 1997/09/14 03:19:02 peter Exp $

+ * $Id: mem.c,v 1.48 1997/11/20 19:30:30 bde Exp $

* Memory special file

+#include "opt_devfs.h"

#include "opt_perfmon.h"

#include <sys/param.h>

diff --git a/sys/i386/isa/alog.c b/sys/i386/isa/alog.c
index db8faf196cde..5312fa13909d 100644
--- a/sys/i386/isa/alog.c
+++ b/sys/i386/isa/alog.c

@@ -61,6 +61,7 @@

#include <sys/alogio.h>

#include <sys/dataacq.h>

+#include "opt_devfs.h"

#ifdef DEVFS

#include <sys/devfsext.h>

#endif

diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 41b6c270dd56..7965ddf934b7 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c

@@ -34,7 +34,7 @@

* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- * $Id: asc.c,v 1.26 1997/04/14 16:47:38 jkh Exp $

+ * $Id: asc.c,v 1.27 1997/09/14 03:19:05 peter Exp $

#include "asc.h"

@@ -61,6 +61,9 @@

#include <sys/malloc.h>

#include <sys/kernel.h>

#include <sys/poll.h>

+#include "opt_devfs.h"

#ifdef DEVFS

#include <sys/devfsext.h>

#endif /*DEVFS*/

diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index 95691268589b..7cacaf14cef2 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c

@@ -53,6 +53,9 @@

#include <sys/uio.h>

#include <sys/conf.h>

#include <sys/kernel.h>

+#include "opt_devfs.h"

#ifdef DEVFS

#include <sys/devfsext.h>

#endif /*DEVFS*/

diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index af1523aa9dc8..92b48b8fffee 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c

@@ -8,7 +8,7 @@

* of this software, nor does the author assume any responsibility

* for damages incurred with its use.

- * $Id: ctx.c,v 1.24 1997/03/24 11:23:40 bde Exp $

+ * $Id: ctx.c,v 1.25 1997/07/20 14:09:52 bde Exp $

@@ -111,6 +111,8 @@

#include "ctx.h"

#if NCTX > 0

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/conf.h>

diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 8b243bec2127..bb78e2964576 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/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/i386/isa/fd.c b/sys/i386/isa/fd.c
index d31c6438b9f4..c179222498e6 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.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/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 2ab210589d12..61f651b7d1c6 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c

@@ -24,6 +24,8 @@

#if NGP > 0

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/conf.h>

diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 310cfa1d18b4..c9aa02dadbe8 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c

@@ -35,6 +35,8 @@

#include "gsc.h"

#if NGSC > 0

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/conf.h>

diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index 569209da619f..01f58f759e15 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c

@@ -20,6 +20,7 @@

#include "cx.h"

#include "bpfilter.h"

+#include "opt_devfs.h"

#include "sppp.h"

#if NSPPP <= 0

diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index ee500445344f..84682a929247 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/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/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 5add67f64446..728611895171 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c

@@ -40,6 +40,7 @@

#include "labpc.h"

+#include "opt_devfs.h"

#include <sys/param.h>

diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 399c69c15611..b2df6064991f 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c

@@ -46,7 +46,7 @@

* SUCH DAMAGE.

* from: unknown origin, 386BSD 0.1

- * $Id: lpt.c,v 1.63 1997/12/02 21:06:24 phk Exp $

+ * $Id: lpt.c,v 1.64 1998/01/08 23:41:10 eivind Exp $

@@ -102,6 +102,7 @@

#include "lpt.h"

+#include "opt_devfs.h"

#include "opt_inet.h"

#include <sys/param.h>

diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 4c585614645e..ba30c2fc3892 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c

@@ -337,13 +337,15 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95";

static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";

/* The proceeding strings may not be changed*/

-/* $Id: matcd.c,v 1.30 1997/11/07 08:52:48 phk Exp $ */

+/* $Id: matcd.c,v 1.31 1997/12/02 21:06:37 phk Exp $ */

/*---------------------------------------------------------------------------

Include declarations

---------------------------------------------------------------------------*/

#include "matcd.h"

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 35439a58fdca..9121a71641d9 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/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 $

#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/i386/isa/mse.c b/sys/i386/isa/mse.c
index 01b285bc3682..2f558d814706 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/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/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 04d42a3d2e19..7f99a7eb04b4 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c

@@ -25,11 +25,12 @@

* (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: pcaudio.c,v 1.37 1997/09/14 03:19:11 peter Exp $

+ * $Id: pcaudio.c,v 1.38 1997/11/18 16:01:15 bde Exp $

#include "pca.h"

#if NPCA > 0

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index f323ce608035..341129200508 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c

@@ -79,6 +79,8 @@

#include "vt.h"

#if NVT > 0

+#include "opt_devfs.h"

#define EXTERN /* allocate mem */

#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */

diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index fb23ba620b15..9207c8d73aec 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c

@@ -20,7 +20,7 @@

* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- * $Id: psm.c,v 1.47 1997/12/07 08:09:17 yokota Exp $

+ * $Id: psm.c,v 1.48 1998/01/20 03:37:26 yokota Exp $

@@ -63,6 +63,7 @@

#include "psm.h"

#include "apm.h"

+#include "opt_devfs.h"

#include "opt_psm.h"

#if NPSM > 0

diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index a643dbc0ac26..61a9b362ed6a 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c

@@ -36,6 +36,8 @@

#include "qcam.h"

#if NQCAM > 0

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/kernel.h>

diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 8d1e298fddf5..2779bbf5087d 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c

@@ -34,6 +34,8 @@

#if NRC > 0

+#include "opt_devfs.h"

/*#define RCDEBUG*/

#include <sys/param.h>

diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 1d97b12c73cb..bdc1c150c515 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/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/i386/isa/si.c b/sys/i386/isa/si.c
index f71871e4ee1f..2ade5e12b88c 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/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/i386/isa/sio.c b/sys/i386/isa/sio.c
index 8c9b71d81c17..922d93b927b9 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/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/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 44415a694037..bda05c868457 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c

@@ -26,11 +26,11 @@

* This is the minimum driver code required to make a spigot work.

* Unfortunatly, I can't include a real driver since the information

* on the spigot is under non-disclosure. You can pick up a library

- * that will work with this driver from ftp://ftp.cs.uwm.edu/pub/FreeBSD.

- * The library contains the source that I can release as well as several

- * object modules and functions that allows one to read spigot data.

- * See the code for spigot_grab.c that is included with the library

- * data.

+ * that will work with this driver from

+ * ftp://ftp.cs.uwm.edu/pub/FreeBSD-UWM. The library contains the

+ * source that I can release as well as several object modules and

+ * functions that allows one to read spigot data. See the code for

+ * spigot_grab.c that is included with the library data.

* The vendor will not allow me to release the spigot library code.

* Please don't ask me for it.

@@ -38,7 +38,7 @@

* To use this driver you will need the spigot library. The library is

* available from:

- * ftp.cs.uwm.edu://pub/FreeBSD/spigot/spigot.tar.gz

+ * ftp.cs.uwm.edu://pub/FreeBSD-UWM/spigot/spigot.tar.gz

* Version 1.7, December 1995.

@@ -51,6 +51,8 @@

error "Can only have 1 spigot configured."

#endif

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/kernel.h>

diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 780b440f4534..4b813ca42463 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/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/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 493cec7cae11..1c07a09365d1 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/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/i386/isa/tw.c b/sys/i386/isa/tw.c
index 603840bd1464..5e7376c903ca 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c

@@ -32,6 +32,8 @@

#include "tw.h"

#if NTW > 0

+#include "opt_devfs.h"

* Driver configuration parameters

diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index e04e1c77ba7f..02e7df4f0c04 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c

@@ -13,12 +13,13 @@

* all derivative works or modified versions.

* From: Version 1.9, Mon Oct 9 20:27:42 MSK 1995

- * $Id: wcd.c,v 1.48 1997/11/07 08:52:43 phk Exp $

+ * $Id: wcd.c,v 1.49 1997/12/02 21:06:30 phk Exp $

#include "wdc.h"

#include "wcd.h"

#include "opt_atapi.h"

+#include "opt_devfs.h"

#if NWCD > 0 && NWDC > 0 && defined (ATAPI)

diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d2140909d62a..d66945929c3d 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c

@@ -34,7 +34,7 @@

* SUCH DAMAGE.

* from: @(#)wd.c 7.2 (Berkeley) 5/9/91

- * $Id: wd.c,v 1.147 1998/01/16 22:13:06 pst Exp $

+ * $Id: wd.c,v 1.148 1998/01/24 02:01:13 dyson Exp $

/* TODO:

@@ -61,12 +61,14 @@

#endif

#include "wdc.h"

-#include "opt_wd.h"

-#include "opt_atapi.h"

#if NWDC > 0

+#include "opt_atapi.h"

+#include "opt_devfs.h"

+#include "opt_wd.h"

#include "pci.h"

#include <sys/param.h>

#include <sys/dkbad.h>

#include <sys/systm.h>

diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index a59d68f889f3..3f4e7356ff36 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c

@@ -20,7 +20,7 @@

* the original CMU copyright notice.

* Version 1.3, Thu Nov 11 12:09:13 MSK 1993

- * $Id: wt.c,v 1.41 1997/08/25 23:31:05 bde Exp $

+ * $Id: wt.c,v 1.42 1997/12/02 21:06:34 phk Exp $

@@ -60,6 +60,8 @@

#include "wt.h"

#if NWT > 0

+#include "opt_devfs.h"

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/kernel.h>