summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/atari/conf/GENERIC.in48
1 files changed, 25 insertions, 23 deletions
diff --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in
index 5aa48813ff0..2382aebd0d5 100644
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.108 2014/08/23 20:26:56 dholland Exp $
+# $NetBSD: GENERIC.in,v 1.109 2014/11/24 08:23:48 tsutsui Exp $
#
# Generic atari
#
@@ -84,9 +84,9 @@ options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
-options IPFILTER_LOG # ipmon(8) log support
-options IPFILTER_LOOKUP # ippool(8) support
-options IPFILTER_COMPAT # Compat for IP-Filter
+#options IPFILTER_LOG # ipmon(8) log support
+#options IPFILTER_LOOKUP # ippool(8) support
+#options IPFILTER_COMPAT # Compat for IP-Filter
#options IPFILTER_DEFAULT_BLOCK # block packages by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
@@ -116,13 +116,13 @@ file-system CD9660 # ISO 9660 filesystem with Rock Ridge
file-system KERNFS # Kernel parameter filesystem
file-system NFS # Network File System client side code
file-system PROCFS # Process filesystem
-file-system FDESC # /dev/fd
+#file-system FDESC # /dev/fd
file-system NULLFS # Loopback filesystem
-file-system OVERLAY # overlay filesystem
-file-system UNION # union file system
-file-system UMAPFS # null file system (with uid & gid remapping)
-file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system EXT2FS # second extended file system (linux)
+#file-system OVERLAY # overlay filesystem
+#file-system UNION # union file system
+#file-system UMAPFS # null file system (with uid & gid remapping)
+#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system EXT2FS # second extended file system (linux)
#file-system LFS # log-structured file system
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
@@ -130,6 +130,7 @@ file-system TMPFS # Efficient memory file-system
# File system options
options WAPBL # File system journaling support
+options FFS_NO_SNAPSHOT # No FFS snapshot support
#if !defined(SMALL030_KERNEL)
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
@@ -198,6 +199,7 @@ options KTRACE # Add kernel tracing system call
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+options MODULAR # new style module(7) framework
#else /* SMALL030_KERNEL */
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
#endif /* !SMALL030_KERNEL */
@@ -205,10 +207,10 @@ options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
#if !defined(SMALL030_KERNEL)
-options SCSIVERBOSE # human readable SCSI error messages
+#options SCSIVERBOSE # human readable SCSI error messages
#endif /* !SMALL030_KERNEL */
#if defined(HADES_KERNEL) || defined(MILAN_KERNEL)
-options MIIVERBOSE # verbose PHY autoconfig messages
+#options MIIVERBOSE # verbose PHY autoconfig messages
#options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
#endif
@@ -254,20 +256,20 @@ pseudo-device sl # Slip
pseudo-device ppp # ppp
#endif /* !SMALL030_KERNEL */
#if !defined(NO_PHYS_NETWORK)
-pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
#endif /* NO_PHYS_NETWORK */
pseudo-device pty # pseudo-terminals
pseudo-device loop # Loopback network
#options VND_COMPRESSION # compressed vnd(4)
pseudo-device md # Boot memory disk
-pseudo-device putter # for puffs and pud
+#pseudo-device putter # for puffs and pud
#if !defined(SMALL030_KERNEL)
pseudo-device vnd # 3 pseudo disks (see vnconfig)
pseudo-device bpfilter # berkeley packet filters
#pseudo-device carp # Common Address Redundancy Protocol
-pseudo-device tun # network tunnel
-pseudo-device tap # virtual Ethernet
+#pseudo-device tun # network tunnel
+#pseudo-device tap # virtual Ethernet
#pseudo-device gre # generic L3 over IP tunnel
pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith # IPv[46] tcp relay translation i/f
@@ -277,7 +279,7 @@ pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device bridge # simple inter-network bridging
#pseudo-device agr # IEEE 802.3ad link aggregation
#endif /* NO_PHYS_NETWORK */
-pseudo-device ccd # concatenating disk driver
+#pseudo-device ccd # concatenating disk driver
#pseudo-device cgd # cryptographic disk driver
#pseudo-device raid # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
@@ -289,8 +291,8 @@ pseudo-device ccd # concatenating disk driver
# options RF_INCLUDE_INTERDECLUSTER=1
# options RF_INCLUDE_PARITY_DECLUSTERING=1
# options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
-pseudo-device fss # file system snapshot device
-pseudo-device ipfilter # IP filtering device
+#pseudo-device fss # file system snapshot device
+#pseudo-device ipfilter # IP filtering device
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
#pseudo-device pf # PF packet filter
@@ -376,11 +378,11 @@ scsibus* at scsi? # SCSI bus
sd* at scsibus? target ? lun ? # SCSI disk drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
#if !defined (SMALL030_KERNEL)
-st* at scsibus? target ? lun ? # SCSI tape drives
-ch* at scsibus? target ? lun ? # SCSI autochangers
-ss* at scsibus? target ? lun ? # SCSI scanners
+#st* at scsibus? target ? lun ? # SCSI tape drives
+#ch* at scsibus? target ? lun ? # SCSI autochangers
+#ss* at scsibus? target ? lun ? # SCSI scanners
se* at scsibus? target ? lun ? # SCSI ethernet
-uk* at scsibus? target ? lun ? # SCSI unknown
+#uk* at scsibus? target ? lun ? # SCSI unknown
#endif /* ! SMALL030_KERNEL */
#endif /* TT030_KERNEL || FALCON_KERNEL */