[src/netbsd-2]: src/sys/arch/alpha/conf Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/4b448051f814
branches:  netbsd-2
changeset: 564302:4b448051f814
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Oct 27 05:20:33 2005 +0000

description:
Pull up following revision(s) (requested by abs in ticket #5893):
        sys/arch/alpha/conf/GENERIC: revision 1.276
If we're enabling ipfilter then we should really have IPFILTER_LOG

diffstat:

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

diffs (27 lines):

diff -r a740e3dfed03 -r 4b448051f814 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Thu Oct 27 05:17:56 2005 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Thu Oct 27 05:20:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.240.2.4.2.3 2005/07/21 19:28:00 riz Exp $
+# $NetBSD: GENERIC,v 1.240.2.4.2.4 2005/10/27 05:20:33 riz Exp $
 #
 # GENERIC machine description file
 #
@@ -25,7 +25,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.240.2.4.2.3 $"
+#ident                 "GENERIC-$Revision: 1.240.2.4.2.4 $"
 
 maxusers 32
 
@@ -106,7 +106,7 @@
 #options       PPP_DEFLATE     # Deflate compression support for PPP
 #options       PPP_FILTER      # Active filter support for PPP (requires bpf)
 #options       PFIL_HOOKS      # pfil(9) packet filter hooks
-#options       IPFILTER_LOG    # ipmon(8) log support
+options        IPFILTER_LOG    # ipmon(8) log support
 #options       IPFILTER_DEFAULT_BLOCK  # block all packets by default
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG