aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2002-07-15 19:11:21 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2002-07-15 19:11:21 +0000
commitfbfee3f615700cdf2457aea18d91f821d927d49b (patch)
tree8ab7ede4c474fb70796bde31e2486533f39d169e
parentd14ca883cb7cd5bff44406a2655e4518d45d449d (diff)
downloadsrc-fbfee3f615700cdf2457aea18d91f821d927d49b.tar.gz
src-fbfee3f615700cdf2457aea18d91f821d927d49b.zip
Move SMBFS from i386 and pc98 files and options files to MI files and
options files.
Notes
Notes: svn path=/head/; revision=100128
-rw-r--r--sys/conf/files6
-rw-r--r--sys/conf/files.i3866
-rw-r--r--sys/conf/files.pc986
-rw-r--r--sys/conf/options5
-rw-r--r--sys/conf/options.i3867
-rw-r--r--sys/conf/options.pc987
6 files changed, 11 insertions, 26 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 3b60ffbf0ad7..97ae16efe46f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -726,6 +726,12 @@ fs/pseudofs/pseudofs.c optional pseudofs
fs/pseudofs/pseudofs_fileno.c optional pseudofs
fs/pseudofs/pseudofs_vncache.c optional pseudofs
fs/pseudofs/pseudofs_vnops.c optional pseudofs
+fs/smbfs/smbfs_io.c optional smbfs
+fs/smbfs/smbfs_node.c optional smbfs
+fs/smbfs/smbfs_smb.c optional smbfs
+fs/smbfs/smbfs_subr.c optional smbfs
+fs/smbfs/smbfs_vfsops.c optional smbfs
+fs/smbfs/smbfs_vnops.c optional smbfs
fs/specfs/spec_vnops.c standard
fs/udf/udf_vfsops.c optional udf
fs/udf/udf_vnops.c optional udf
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index f2bd8c518005..91e1f577c744 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -137,12 +137,6 @@ dev/syscons/scvidctl.c optional sc
dev/syscons/scvtb.c optional sc
dev/syscons/syscons.c optional sc
dev/syscons/sysmouse.c optional sc
-fs/smbfs/smbfs_io.c optional smbfs
-fs/smbfs/smbfs_node.c optional smbfs
-fs/smbfs/smbfs_smb.c optional smbfs
-fs/smbfs/smbfs_subr.c optional smbfs
-fs/smbfs/smbfs_vfsops.c optional smbfs
-fs/smbfs/smbfs_vnops.c optional smbfs
gnu/i386/fpemul/div_small.s optional gpl_math_emulate \
warning "kernel contains GPL contaminated math emulator"
gnu/i386/fpemul/errors.c optional gpl_math_emulate
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 1ad3daf3142d..9d313f4aa915 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -130,12 +130,6 @@ dev/syscons/scterm.c optional sc
dev/syscons/scterm-dumb.c optional sc
dev/syscons/scvidctl.c optional sc
dev/syscons/sysmouse.c optional sc
-fs/smbfs/smbfs_io.c optional smbfs
-fs/smbfs/smbfs_node.c optional smbfs
-fs/smbfs/smbfs_smb.c optional smbfs
-fs/smbfs/smbfs_subr.c optional smbfs
-fs/smbfs/smbfs_vfsops.c optional smbfs
-fs/smbfs/smbfs_vnops.c optional smbfs
gnu/i386/fpemul/div_small.s optional gpl_math_emulate \
warning "kernel contains GPL contaminated math emulator"
gnu/i386/fpemul/errors.c optional gpl_math_emulate
diff --git a/sys/conf/options b/sys/conf/options
index 077f1db328de..064d74373163 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -143,6 +143,7 @@ PSEUDOFS opt_dontuse.h
UMAPFS opt_dontuse.h
NTFS opt_dontuse.h
HPFS opt_dontuse.h
+SMBFS opt_dontuse.h
UNIONFS opt_dontuse.h
UDF opt_dontuse.h
@@ -182,6 +183,10 @@ UFS_DIRHASH opt_ufs.h
# they won't make any difference yet).
NFS_ROOT opt_nfsroot.h
+# SMB/CIFS requester
+NETSMB opt_netsmb.h
+NETSMBCRYPTO opt_netsmb.h
+
# Options used only in subr_param.c.
HZ opt_param.h
MAXFILES opt_param.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 036e4c181813..2bb23871fe6f 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -173,13 +173,6 @@ IPR_LOG opt_i4b.h
DEV_NPX opt_npx.h
DEV_SPLASH opt_splash.h
-# SMB/CIFS requester
-NETSMB opt_netsmb.h
-NETSMBCRYPTO opt_netsmb.h
-
-# SMB/CIFS filesystem
-SMBFS
-
# -------------------------------
# EOF
# -------------------------------
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index c062d8fc9a6f..98ba0cca27ce 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -161,13 +161,6 @@ DEV_NPX opt_npx.h
DEV_SPLASH opt_splash.h
DEV_MECIA opt_mecia.h
-# SMB/CIFS requester
-NETSMB opt_netsmb.h
-NETSMBCRYPTO opt_netsmb.h
-
-# SMB/CIFS filesystem
-SMBFS
-
# -------------------------------
# EOF
# -------------------------------