diff options
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/conf/files | 16 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index efec332aef0..b53d3eb95e8 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.189 2012/07/26 15:52:28 otto Exp $ +# $OpenBSD: GENERIC,v 1.190 2012/08/23 06:12:49 deraadt Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -41,7 +41,6 @@ option UFS_DIRHASH # hash large directories option QUOTA # UFS quotas option EXT2FS # Second Extended Filesystem option MFS # memory file system -#option NNPFS # NNPFS filesystem option NFSCLIENT # Network File System client option NFSSERVER # Network File System server option CD9660 # ISO 9660 + Rock Ridge file system diff --git a/sys/conf/files b/sys/conf/files index 3878a6926b3..95159a084e1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.537 2012/04/26 01:22:31 matthew Exp $ +# $OpenBSD: files,v 1.538 2012/08/23 06:12:49 deraadt Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -916,20 +916,6 @@ file ufs/ext2fs/ext2fs_readwrite.c ext2fs file ufs/ext2fs/ext2fs_subr.c ext2fs file ufs/ext2fs/ext2fs_vfsops.c ext2fs file ufs/ext2fs/ext2fs_vnops.c ext2fs -file nnpfs/nnpfs_common-bsd.c nnpfs -file nnpfs/nnpfs_deb.c nnpfs -file nnpfs/nnpfs_dev-bsd.c nnpfs -file nnpfs/nnpfs_dev-common.c nnpfs -file nnpfs/nnpfs_message.c nnpfs -file nnpfs/nnpfs_node.c nnpfs -file nnpfs/nnpfs_node-bsd.c nnpfs -file nnpfs/nnpfs_syscalls-common.c nnpfs -file nnpfs/nnpfs_vfsops-bsd.c nnpfs -file nnpfs/nnpfs_vfsops-common.c nnpfs -file nnpfs/nnpfs_vfsops-openbsd.c nnpfs -file nnpfs/nnpfs_vnodeops-bsd.c nnpfs -file nnpfs/nnpfs_vnodeops-common.c nnpfs -file nnpfs/nnpfs_syscalls-dummy.c !nnpfs file uvm/uvm_addr.c file uvm/uvm_amap.c file uvm/uvm_anon.c |