[src/trunk]: src/sys/arch/amd64/conf back out unintentional change in 1.352.

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

details:   https://anonhg.NetBSD.org/src/rev/bdf5629ffc83
branches:  trunk
changeset: 781356:bdf5629ffc83
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Sep 01 15:25:33 2012 +0000

description:
back out unintentional change in 1.352.

diffstat:

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

diffs (27 lines):

diff -r bd7e1eb19fd5 -r bdf5629ffc83 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Sep 01 15:06:57 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Sep 01 15:25:33 2012 +0000
@@ -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 @@
 
 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  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
 
 #