[src/trunk]: src/sys/arch/i386/conf add pseudo-device mpls - commented in GEN...

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

details:   https://anonhg.NetBSD.org/src/rev/bc022c031602
branches:  trunk
changeset: 755886:bc022c031602
user:      kefren <kefren%NetBSD.org@localhost>
date:      Sat Jun 26 14:36:48 2010 +0000

description:
add pseudo-device mpls - commented in GENERIC for now

diffstat:

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

diffs (52 lines):

diff -r 020190c2b2fd -r bc022c031602 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sat Jun 26 14:30:31 2010 +0000
+++ b/sys/arch/i386/conf/ALL    Sat Jun 26 14:36:48 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.258 2010/05/22 19:02:08 plunky Exp $
+# $NetBSD: ALL,v 1.259 2010/06/26 14:36:48 kefren 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.258 $"
+#ident                 "ALL-$Revision: 1.259 $"
 
 maxusers       64              # estimated number of users
 
@@ -1593,6 +1593,7 @@
 pseudo-device  bpfilter                # Berkeley packet filter
 pseudo-device  carp                    # Common Address Redundancy Protocol
 pseudo-device  ipfilter                # IP filter (firewall) and NAT
+pseudo-device  mpls                    # MultiProtocol Label Switching
 pseudo-device  loop                    # network loopback
 pseudo-device  ppp                     # Point-to-Point Protocol
 pseudo-device  pppoe                   # PPP over Ethernet (RFC 2516)
diff -r 020190c2b2fd -r bc022c031602 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Jun 26 14:30:31 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Jun 26 14:36:48 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.984 2010/06/01 02:40:13 mrg Exp $
+# $NetBSD: GENERIC,v 1.985 2010/06/26 14:36:48 kefren Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.984 $"
+#ident                 "GENERIC-$Revision: 1.985 $"
 
 maxusers       64              # estimated number of users
 
@@ -1536,6 +1536,7 @@
 #pseudo-device carp                    # Common Address Redundancy Protocol
 pseudo-device  ipfilter                # IP filter (firewall) and NAT
 pseudo-device  loop                    # network loopback
+#pseudo-device mpls                    # MultiProtocol Label Switching
 pseudo-device  ppp                     # Point-to-Point Protocol
 pseudo-device  pppoe                   # PPP over Ethernet (RFC 2516)
 #options       PPPOE_SERVER            # Enable PPPoE server via link0