[src/trunk]: src/sys/arch/amd64/conf add l2tp(4) to amd64/GENERIC and amd64/A...

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

details:   https://anonhg.NetBSD.org/src/rev/4cb163110541
branches:  trunk
changeset: 351501:4cb163110541
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Feb 16 08:45:42 2017 +0000

description:
add l2tp(4) to amd64/GENERIC and amd64/ALL config.

diffstat:

 sys/arch/amd64/conf/ALL     |  5 +++--
 sys/arch/amd64/conf/GENERIC |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 929d0ea95b6f -r 4cb163110541 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Thu Feb 16 08:44:47 2017 +0000
+++ b/sys/arch/amd64/conf/ALL   Thu Feb 16 08:45:42 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.49 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: ALL,v 1.50 2017/02/16 08:45:42 knakahara Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.49 $"
+#ident         "ALL-$Revision: 1.50 $"
 
 maxusers       64              # estimated number of users
 
@@ -1573,6 +1573,7 @@
 pseudo-device  bridge                  # simple inter-network bridging
 options        BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
 pseudo-device  agr                     # IEEE 802.3ad link aggregation
+pseudo-device  l2tp                    # L2TPv3 interface
 #pseudo-device pf                      # PF packet filter
 #pseudo-device pflog                   # PF log if
 #pseudo-device pfsync                  # PF sync if
diff -r 929d0ea95b6f -r 4cb163110541 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Thu Feb 16 08:44:47 2017 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Thu Feb 16 08:45:42 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.450 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: GENERIC,v 1.451 2017/02/16 08:45:42 knakahara Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.450 $"
+#ident         "GENERIC-$Revision: 1.451 $"
 
 maxusers       64              # estimated number of users
 
@@ -1271,6 +1271,7 @@
 pseudo-device  bridge                  # simple inter-network bridging
 #options       BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
 pseudo-device  agr                     # IEEE 802.3ad link aggregation
+pseudo-device  l2tp                    # L2TPv3 interface
 #pseudo-device pf                      # PF packet filter
 #pseudo-device pflog                   # PF log if
 #pseudo-device pfsync                  # PF sync if