[src/trunk]: src/sys/arch/amd64/conf Missing MPLS options (commented out).

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

details:   https://anonhg.NetBSD.org/src/rev/5690296b3425
branches:  trunk
changeset: 762006:5690296b3425
user:      jym <jym%NetBSD.org@localhost>
date:      Sun Feb 13 04:21:23 2011 +0000

description:
Missing MPLS options (commented out).

diffstat:

 sys/arch/amd64/conf/GENERIC |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r af5596729e1c -r 5690296b3425 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Feb 13 04:14:58 2011 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Feb 13 04:21:23 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.302 2011/02/11 02:06:09 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.303 2011/02/13 04:21:23 jym Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.302 $"
+#ident                 "GENERIC-$Revision: 1.303 $"
 
 maxusers       64              # estimated number of users
 
@@ -175,6 +175,7 @@
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
 #options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
+#options       MPLS            # MultiProtocol Label Switching (needs ifmpls)
 #options       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast
 #options       ISO,TPIP        # OSI