Module Name: src
Committed By: riz
Date: Fri Nov 22 18:58:01 UTC 2013
Modified Files:
src/sys/arch/i386/conf: ALL
Log Message:
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!
To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/sys/arch/i386/conf/ALL
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.364 src/sys/arch/i386/conf/ALL:1.365
--- src/sys/arch/i386/conf/ALL:1.364 Sat Oct 26 09:16:20 2013
+++ src/sys/arch/i386/conf/ALL Fri Nov 22 18:58:01 2013
@@ -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 @@ include "arch/i386/conf/std.i386"
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 agr # IEEE 802.3ad link
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
