[src/netbsd-1-5]: src/sys/arch/arm32/conf Pull up rev. 1.37 to netbsd-1-5 bra...

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c95e07db655
branches:  netbsd-1-5
changeset: 488869:3c95e07db655
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Fri Aug 04 04:08:09 2000 +0000

description:
Pull up rev. 1.37 to netbsd-1-5 branch, OK'd by thorpej:

 > sync with GENERIC rev. 1.72

diffstat:

 sys/arch/arm32/conf/SHARK |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r a69cd593fbbf -r 3c95e07db655 sys/arch/arm32/conf/SHARK
--- a/sys/arch/arm32/conf/SHARK Fri Aug 04 04:07:04 2000 +0000
+++ b/sys/arch/arm32/conf/SHARK Fri Aug 04 04:08:09 2000 +0000
@@ -1,13 +1,14 @@
-#      $NetBSD: SHARK,v 1.35.2.1 2000/07/25 23:08:18 is Exp $
-# From:  NetBSD: GENERIC,v 1.61 2000/01/20 19:12:29 wrstuden Exp
+#      $NetBSD: SHARK,v 1.35.2.2 2000/08/04 04:08:09 hubertf Exp $
+# From: NetBSD: GENERIC,v 1.72 2000/08/04 02:17:46 hubertf Exp
 #
 #      SHARK
 #
 
 include        "arch/arm32/conf/std.arm32"
 
+#ident         "GENERIC-$Revision: 1.35.2.2 $"
+
 # estimated number of users
-
 maxusers       32
 
 # Standard system options
@@ -60,7 +61,7 @@
 # File system options
 #options       QUOTA           # UFS quotas
 #options       FFS_EI          # FFS Endian Independant support
-#options       SOFTDEP         # FFS soft updates support.
+options        SOFTDEP         # FFS soft updates support.
 #options       NFSSERVER
 
 # Networking options
@@ -68,6 +69,7 @@
 #options       GATEWAY         # packet forwarding
 options        INET            # IP + ICMP + TCP + UDP
 options        INET6           # IPV6
+options                PULLDOWN_TEST   # use m_pulldown for IPv4/v6 processing
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
 #options       IPSEC_DEBUG     # debug for IP security
@@ -208,8 +210,9 @@
 #pseudo-device ipfilter 1              # ip filter
 pseudo-device  gif     4               # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith   1               # IPv[46] tcp relay translation i/f
-
-pseudo-device  pty     32              # pseudo-terminals
+#pseudo-device stf     1               # 6to4 IPv6 over IPv4 encapsulation
+#pseudo-device strip   4               # STarmode Radio IP (Metricon Ricochet)
+pseudo-device  pty     64              # pseudo-terminals
 #pseudo-device tb      1               # tablet line discipline
 pseudo-device  vnd     4               # disk-like interface to files
 #pseudo-device ccd     2               # concatenated disk devices