summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 22f982647f2..55e8f31a8bd 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.222 2015/10/24 10:52:05 reyk Exp $
+# $OpenBSD: GENERIC,v 1.223 2015/12/03 12:42:03 goda Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -91,6 +91,7 @@ pseudo-device systrace 1 # system call tracing device
pseudo-device bpfilter # packet filter
pseudo-device bridge # network bridging support
pseudo-device carp # CARP protocol support
+pseudo-device etherip # EtherIP (RFC 3378)
pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
pseudo-device gre # GRE encapsulation interface
pseudo-device loop # network loopback