diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC index 2ac7539d355c..795bdcc692ae 100644 --- a/sys/arch/pmax/conf/GENERIC +++ b/sys/arch/pmax/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.113 2003/12/13 23:04:37 ad Exp $ +# $NetBSD: GENERIC,v 1.114 2003/12/19 11:38:18 tsutsui Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ include "arch/pmax/conf/files.pmax_rcons" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.113 $" +#ident "GENERIC-$Revision: 1.114 $" maxusers 64 @@ -65,7 +65,7 @@ options SYSVSHM # System V-like memory sharing options LKM # loadable kernel modules options USERCONF # userconf(4) support -#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) # Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. @@ -128,10 +128,10 @@ options IPFILTER_LOG # ipmon(8) log support # NetBSD backwards compatibility #options COMPAT_10 # NetBSD 1.0, (needed for X on 386?) #options COMPAT_11 # NetBSD 1.1, EXEC_ELF_NOTELESS -options COMPAT_12 # Netbsd 1.2 reboot(), EXEC_ELF_NOTELESS -options COMPAT_13 # Netbsd 1.3 -options COMPAT_14 # Netbsd 1.4 -options COMPAT_16 # Netbsd 1.6 +options COMPAT_12 # NetBSD 1.2 reboot(), EXEC_ELF_NOTELESS +options COMPAT_13 # NetBSD 1.3 +options COMPAT_14 # NetBSD 1.4 +options COMPAT_16 # NetBSD 1.6 #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. # Raster console options @@ -228,7 +228,7 @@ pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging -#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too +#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device vnd 4 # virtual disk ick pseudo-device ccd 4 # concatenated disks @@ -236,13 +236,13 @@ pseudo-device ccd 4 # concatenated disks pseudo-device raid 8 # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components # Options to enable various other RAIDframe RAID types. -# options RF_INCLUDE_EVENODD=1 -# options RF_INCLUDE_RAID5_RS=1 -# options RF_INCLUDE_PARITYLOGGING=1 -# options RF_INCLUDE_CHAINDECLUSTER=1 -# options RF_INCLUDE_INTERDECLUSTER=1 -# options RF_INCLUDE_PARITY_DECLUSTERING=1 -# options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 +#options RF_INCLUDE_EVENODD=1 +#options RF_INCLUDE_RAID5_RS=1 +#options RF_INCLUDE_PARITYLOGGING=1 +#options RF_INCLUDE_CHAINDECLUSTER=1 +#options RF_INCLUDE_INTERDECLUSTER=1 +#options RF_INCLUDE_PARITY_DECLUSTERING=1 +#options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 pseudo-device rasterconsole 1 # NB: raster console requires "fb" pseudo-device fb 3 # up to 3 framebuffers