[src/trunk]: src/sys/arch/i386/conf Comment out npf for now, as we can't have...

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

details:   https://anonhg.NetBSD.org/src/rev/1b8ccd0eacf4
branches:  trunk
changeset: 791541:1b8ccd0eacf4
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Nov 22 18:58:01 2013 +0000

description:
Comment out npf for now, as we can't have both NPF and PF in the
same kernel - rmind has said he'll address this eventually,
and for now PF is more likely to have unnoticed breakage.  ALL now
builds again!

diffstat:

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

diffs (27 lines):

diff -r 9e790f0f6fdb -r 1b8ccd0eacf4 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Fri Nov 22 18:56:27 2013 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Nov 22 18:58:01 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.364 2013/10/26 09:16:20 nonaka Exp $
+# $NetBSD: ALL,v 1.365 2013/11/22 18:58:01 riz 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.364 $"
+#ident                 "ALL-$Revision: 1.365 $"
 
 maxusers       64              # estimated number of users
 
@@ -1719,7 +1719,7 @@
 pseudo-device  pf                      # PF packet filter
 pseudo-device  pflog                   # PF log if
 pseudo-device  pfsync                  # PF sync if
-pseudo-device  npf                     # NPF packet filter
+#pseudo-device npf                     # NPF packet filter
 pseudo-device  kttcp
 pseudo-device  etherip                 # EtherIP
 # srt is EXPERIMENTAL