[src/netbsd-1-6]: src/sys/arch/vax/conf Pull up revisions 1.104-1.105 (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/7425d1e294f4
branches:  netbsd-1-6
changeset: 529673:7425d1e294f4
user:      he <he%NetBSD.org@localhost>
date:      Sat Dec 07 21:25:02 2002 +0000

description:
Pull up revisions 1.104-1.105 (requested by abs in ticket #889):
  Enable ppp and PPP_* options.

diffstat:

 sys/arch/vax/conf/GENERIC |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r e37c583e492b -r 7425d1e294f4 sys/arch/vax/conf/GENERIC
--- a/sys/arch/vax/conf/GENERIC Sat Dec 07 21:17:59 2002 +0000
+++ b/sys/arch/vax/conf/GENERIC Sat Dec 07 21:25:02 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97.4.3 2002/10/24 09:34:44 lukem Exp $
+# $NetBSD: GENERIC,v 1.97.4.4 2002/12/07 21:25:02 he Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.97.4.3 $"
+#ident                 "GENERIC-$Revision: 1.97.4.4 $"
 
 # Here are all different supported CPU types listed.
 #options       VAX8800         # VAX 8500, 8530, 8550, 8700, 8800
@@ -71,9 +71,9 @@
 #options       EON             # OSI tunneling over IP
 #options       CCITT,LLC,HDLC  # X.25
 #options       NETATALK        # AppleTalk networking protocols
-#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        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       PFIL_HOOKS      # pfil(9) packet filter hooks
 #options       IPFILTER_LOG    # ipmon(8) log support
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
@@ -253,7 +253,7 @@
 pseudo-device  bpfilter 8              # Not supported by de yet.
 pseudo-device  ipfilter                # IP filter (firewall) and NAT
 #pseudo-device sl      2
-#pseudo-device ppp     2
+pseudo-device  ppp     2
 #pseudo-device pppoe                   # PPP over Ethernet (RFC 2516)
 pseudo-device  tun     2
 #pseudo-device gre     2               # generic L3 over IP tunnel