diff options
| author | kato <kato@FreeBSD.org> | 2000-03-01 08:52:28 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2000-03-01 08:52:28 +0000 |
| commit | be13bac0e8f1c2e0051c2ea445c65c3698446a17 (patch) | |
| tree | c642d2f7d4c6ce6c9cf23cab0f75e99f28b38670 /sys/pc98/conf | |
| parent | b5da0aba878db62cc9e66ed624c8d629d7f074d2 (diff) | |
| download | FreeBSD-src-be13bac0e8f1c2e0051c2ea445c65c3698446a17.zip FreeBSD-src-be13bac0e8f1c2e0051c2ea445c65c3698446a17.tar.gz | |
Merged from sys/i386/conf/GENERIC revisions 1.243, 1.244 and 1.245.
Diffstat (limited to 'sys/pc98/conf')
| -rw-r--r-- | sys/pc98/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/pc98/conf/GENERIC98 | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 76fd0e1..e8b98a3 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -30,6 +30,7 @@ maxusers 32 options PC98 #PC98 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking +options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options FFS_ROOT #FFS usable as root device [keep this!] options MFS #Memory Filesystem @@ -287,6 +288,8 @@ pseudo-device ppp 1 # Kernel PPP pseudo-device tun # Packet tunnel. pseudo-device pty # Pseudo-ttys (telnet etc) pseudo-device md # Memory "disks" +pseudo-device gif 4 # IPv6 and IPv4 tunneling +pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) # The `bpf' pseudo-device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! @@ -304,7 +307,7 @@ pseudo-device bpf #Berkeley packet filter #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da #device ums # Mouse -# USB Ethernet +# USB Ethernet, requires mii #device aue # ADMtek USB ethernet #device cue # CATC USB ethernet #device kue # Kawasaki LSI USB ethernet diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index 76fd0e1..e8b98a3 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -30,6 +30,7 @@ maxusers 32 options PC98 #PC98 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking +options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options FFS_ROOT #FFS usable as root device [keep this!] options MFS #Memory Filesystem @@ -287,6 +288,8 @@ pseudo-device ppp 1 # Kernel PPP pseudo-device tun # Packet tunnel. pseudo-device pty # Pseudo-ttys (telnet etc) pseudo-device md # Memory "disks" +pseudo-device gif 4 # IPv6 and IPv4 tunneling +pseudo-device faith 1 # IPv6-to-IPv4 relaying (translation) # The `bpf' pseudo-device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! @@ -304,7 +307,7 @@ pseudo-device bpf #Berkeley packet filter #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da #device ums # Mouse -# USB Ethernet +# USB Ethernet, requires mii #device aue # ADMtek USB ethernet #device cue # CATC USB ethernet #device kue # Kawasaki LSI USB ethernet |
