Module Name: src
Committed By: christos
Date: Fri Feb 18 23:38:58 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
add ifmpls since MPLS was added
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/arch/amd64/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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.307 src/sys/arch/amd64/conf/GENERIC:1.308
--- src/sys/arch/amd64/conf/GENERIC:1.307 Wed Feb 16 15:23:21 2011
+++ src/sys/arch/amd64/conf/GENERIC Fri Feb 18 18:38:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.307 2011/02/16 20:23:21 jym Exp $
+# $NetBSD: GENERIC,v 1.308 2011/02/18 23:38:58 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.307 $"
+#ident "GENERIC-$Revision: 1.308 $"
maxusers 64 # estimated number of users
@@ -1131,6 +1131,7 @@
#pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
+#pseudo-device ifmpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP
