diff options
-rw-r--r-- | sys/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/conf/files | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 8c4a80d0c2c..354b6fad7a0 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.59 1999/12/30 19:09:58 provos Exp $ +# $OpenBSD: GENERIC,v 1.60 2000/01/08 04:34:37 angelos Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -91,5 +91,6 @@ pseudo-device vnd 4 # paging to files pseudo-device ccd 4 # concatenated disk devices pseudo-device ksyms 1 # kernel symbols device pseudo-device bridge 2 # network bridging support +pseudo-device gre 1 # GRE encapsulation interface option BOOT_CONFIG # add support for boot -c diff --git a/sys/conf/files b/sys/conf/files index cf733dc024b..99e4ad743af 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.145 2000/01/06 21:01:15 fgsch Exp $ +# $OpenBSD: files,v 1.146 2000/01/08 04:34:37 angelos Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -196,6 +196,7 @@ pseudo-device bridge: ifnet, ether pseudo-device sppp: ifnet pseudo-device faith: ifnet pseudo-device gif: ifnet +pseudo-device gre: ifnet pseudo-device sequencer @@ -447,6 +448,7 @@ file net/route.c file net/rtsock.c file net/slcompress.c sl | ppp | strip file net/if_enc.c enc needs-count +file net/if_gre.c gre needs-count file netccitt/ccitt_proto.c ccitt file netccitt/hd_debug.c hdlc file netccitt/hd_input.c hdlc @@ -485,6 +487,7 @@ file netinet/tcp_subr.c inet file netinet/tcp_timer.c inet file netinet/tcp_usrreq.c inet file netinet/udp_usrreq.c inet +file netinet/ip_gre.c inet file netinet/ip_fil.c ipfilter file netinet/fil.c ipfilter file netinet/ip_nat.c ipfilter |