Module Name: src
Committed By: kefren
Date: Sat Jun 26 14:36:48 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
add pseudo-device mpls - commented in GENERIC for now
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.984 -r1.985 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.258 src/sys/arch/i386/conf/ALL:1.259
--- src/sys/arch/i386/conf/ALL:1.258 Sat May 22 19:02:08 2010
+++ src/sys/arch/i386/conf/ALL Sat Jun 26 14:36:48 2010
@@ -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)
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.984 src/sys/arch/i386/conf/GENERIC:1.985
--- src/sys/arch/i386/conf/GENERIC:1.984 Tue Jun 1 02:40:13 2010
+++ src/sys/arch/i386/conf/GENERIC Sat Jun 26 14:36:48 2010
@@ -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
