Module Name: src
Committed By: jakllsch
Date: Sat Sep 1 15:25:33 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
back out unintentional change in 1.352.
To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 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.361 src/sys/arch/amd64/conf/GENERIC:1.362
--- src/sys/arch/amd64/conf/GENERIC:1.361 Mon Aug 27 03:18:12 2012
+++ src/sys/arch/amd64/conf/GENERIC Sat Sep 1 15:25:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.361 2012/08/27 03:18:12 dholland Exp $
+# $NetBSD: GENERIC,v 1.362 2012/09/01 15:25:33 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.361 $"
+#ident "GENERIC-$Revision: 1.362 $"
maxusers 64 # estimated number of users
@@ -1204,7 +1204,7 @@ pseudo-device gif # IPv[46] over IPv[4
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
+#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
