Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/conf Sync with GENERIC 1.67



details:   https://anonhg.NetBSD.org/src/rev/8ac36646891e
branches:  trunk
changeset: 518125:8ac36646891e
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sun Nov 25 05:21:12 2001 +0000

description:
Sync with GENERIC 1.67

diffstat:

 sys/arch/x68k/conf/INSTALL |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (78 lines):

diff -r 93b508533b2f -r 8ac36646891e sys/arch/x68k/conf/INSTALL
--- a/sys/arch/x68k/conf/INSTALL        Sun Nov 25 05:10:03 2001 +0000
+++ b/sys/arch/x68k/conf/INSTALL        Sun Nov 25 05:21:12 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.43 2001/11/25 05:10:03 isaki Exp $
+#      $NetBSD: INSTALL,v 1.44 2001/11/25 05:21:12 isaki Exp $
 
 #
 #      INSTALL -- installation kernel.
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident                 "INSTALL-$Revision: 1.43 $"
+#ident                 "INSTALL-$Revision: 1.44 $"
 
 makeoptions    COPTS="-Os"             # Optimise for space. Implies -O2
 
@@ -149,7 +149,7 @@
 #options       EXEC_ELF32      # 32-bit ELF executables (Linux, SVR4)
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
 
-## File systems
+## File systems.
 file-system    FFS             # Berkeley Fast Filesystem
 file-system    NFS             # Sun NFS-compatible filesystem client
 #file-system   KERNFS          # kernel data-structure filesystem
@@ -166,7 +166,7 @@
 file-system    MSDOSFS         # MS-DOS FAT filesystem(s).
 #file-system   ADOSFS          # AmigaDOS filesystem
 
-# File system options.
+## File system options.
 #options       NFSSERVER       # Sun NFS-compatible filesystem server
 #options       QUOTA           # FFS quotas
 #options       FFS_EI          # FFS Endian Independent support
@@ -199,7 +199,6 @@
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
 
-
 #### Device configurations
 
 ## Fundamental devices; see also std.x68k
@@ -264,7 +263,6 @@
 neptune0 at intio0 addr 0xece000 intr 249      # Neptune-X
 neptune1 at intio0 addr 0xece400 intr 249      # Neptune-X at alt. addr.
 ne*    at neptune? addr 0x300                  # NE2000 or clone
-#se0   at scsibus? target ? lun ?              # Ether+; broken
 
 
 #### Pseudo devices
@@ -307,17 +305,23 @@
 
 ## Berkeley Packet Filter, required to run RARPD.  A generic C-language
 ## interface that allows selective examining of incoming packets.
-#pseudo-device bpfilter        8
+#pseudo-device bpfilter        4
 
 ## IP Filter, used in firewall and NAT applications.  See ipnat(8) for
 ## one example of the use of the IP Filter.
 #pseudo-device ipfilter
 
 ## for IPv6
-#pseudo-device gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device gif             1       # IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device faith           1       # IPv[46] tcp relay translation i/f
 #pseudo-device stf             1       # 6to4 IPv6 over IPv4 encapsulation
 
+## IEEE 802.1Q Virtual LAN encapsulation, see vlan(4).
+#pseudo-device  vlan
+
+## Simple inter-network traffic bridging
+#pseudo-device  bridge
+
 #### Other device configuration
 
 ## Pseudo ttys, required for network logins and programs like screen.



Home | Main Index | Thread Index | Old Index