Merged from sys/i386/conf/GENERIC revision 1.313.

This commit is contained in:
Yoshihiro Takahashi 2001-07-14 02:45:53 +00:00
parent 654739ff90
commit dd080a65a2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=79701

View file

@ -199,7 +199,7 @@ device ppp 1 # Kernel PPP
device tun # Packet tunnel.
device pty # Pseudo-ttys (telnet etc)
device md # Memory "disks"
device gif 4 # IPv6 and IPv4 tunneling
device gif # IPv6 and IPv4 tunneling
device faith 1 # IPv6-to-IPv4 relaying (translation)
# The `bpf' device enables the Berkeley Packet Filter.