summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Wooding <kjell@cvs.openbsd.org>2001-06-25 04:31:51 +0000
committerKjell Wooding <kjell@cvs.openbsd.org>2001-06-25 04:31:51 +0000
commit3703d05933d1f85bdefcf7f54865870b81dabd99 (patch)
tree25dfb50117e9b7dd1b86f0c2f1d9ddd25b0136a2
parent19419baf980d8e8dd3c02bb1d14ea041840ffc38 (diff)
move pf hooks to sys/conf/GENERIC
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/conf/GENERIC3
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index dbbc538fc35..5d6a5ae57a3 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.263 2001/06/24 19:48:56 kjell Exp $
+# $OpenBSD: GENERIC,v 1.264 2001/06/25 04:31:50 kjell Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -440,7 +440,6 @@ pseudo-device sequencer 1
#pseudo-device raid 4 # RAIDframe disk driver
# mouse & keyboard multiplexor pseudo-devices
-pseudo-device pf 1 # packetfilter
pseudo-device wsmux 2
pseudo-device crypto 1
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 5abc542e1a2..9eb38726c42 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.76 2001/05/30 02:12:22 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.77 2001/06/25 04:31:50 kjell Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -79,6 +79,7 @@ option PPP_BSDCOMP # PPP BSD compression
option PPP_DEFLATE
#option MROUTING # Multicast router
+pseudo-device pf 1 # packet filter
pseudo-device loop 2 # network loopback
pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP