diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 9899d632b3c9..8437f8822b77 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,6 +1,4 @@ -# $NetBSD: GENERIC,v 1.5 1995/03/01 21:11:43 pk Exp $ - -# Kernel for Theo's wimpy sparcstation IPC +# $NetBSD: GENERIC,v 1.6 1995/03/02 20:48:17 pk Exp $ machine sparc options "SUN4", "SUN4C" @@ -23,14 +21,15 @@ options FFS options NFSSERVER # Sun NFS-compatible filesystem options NFSCLIENT # Sun NFS-compatible filesystem options KERNFS # kernel data-structure filesystem -#options FIFO # POSIX fifo support (in all filesystems) -#options QUOTA # fast filesystem with user and group quotas -#options MFS # memory-based filesystem -#options LOFS # Loop-back filesystem -#options FDESC # user file descriptor filesystem -#options UMAPFS # uid/gid remapping filesystem -#options LFS # Log-based filesystem (still experimental) -#options PORTAL # portal filesystem (still experimental) +options FIFO # POSIX fifo support (in all filesystems) +options QUOTA # fast filesystem with user and group quotas +options MFS # memory-based filesystem +options LOFS # Loop-back filesystem +options FDESC # user file descriptor filesystem +options UMAPFS # uid/gid remapping filesystem +options LFS # Log-based filesystem (still experimental) +options PORTAL # portal filesystem (still experimental) +options PROCFS # /proc options CD9660 # ISO 9660 + Rock Ridge file system # Networking options @@ -116,6 +115,9 @@ sd* at scsibus? target ? drive ? st* at scsibus? target ? drive ? cd* at scsibus? target ? drive ? +fdc0 at mainbus0 +fd* at fdc0 + pseudo-device loop pseudo-device pty 32 pseudo-device sl 2 diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3 index 32c86b655df7..23df6d0a3f4f 100644 --- a/sys/arch/sparc/conf/GENERIC_SCSI3 +++ b/sys/arch/sparc/conf/GENERIC_SCSI3 @@ -1,12 +1,10 @@ -# $NetBSD: GENERIC_SCSI3,v 1.5 1995/03/01 21:11:46 pk Exp $ - -# Kernel for Theo's wimpy sparcstation IPC +# $NetBSD: GENERIC_SCSI3,v 1.6 1995/03/02 20:48:20 pk Exp $ machine sparc -options "SUN4C", "SUN4" +options "SUN4", "SUN4C" # obsolete timezone spec -options TIMEZONE=0, DST=0 +options TIMEZONE=0, DST=0 # Standard system options options SWAPPAGER, VNODEPAGER, DEVPAGER # paging @@ -23,14 +21,15 @@ options FFS options NFSSERVER # Sun NFS-compatible filesystem options NFSCLIENT # Sun NFS-compatible filesystem options KERNFS # kernel data-structure filesystem -#options FIFO # POSIX fifo support (in all filesystems) -#options QUOTA # fast filesystem with user and group quotas -#options MFS # memory-based filesystem -#options LOFS # Loop-back filesystem -#options FDESC # user file descriptor filesystem -#options UMAPFS # uid/gid remapping filesystem -#options LFS # Log-based filesystem (still experimental) -#options PORTAL # portal filesystem (still experimental) +options FIFO # POSIX fifo support (in all filesystems) +options QUOTA # fast filesystem with user and group quotas +options MFS # memory-based filesystem +options LOFS # Loop-back filesystem +options FDESC # user file descriptor filesystem +options UMAPFS # uid/gid remapping filesystem +options LFS # Log-based filesystem (still experimental) +options PORTAL # portal filesystem (still experimental) +options PROCFS # /proc options CD9660 # ISO 9660 + Rock Ridge file system # Networking options @@ -120,6 +119,9 @@ sd* at scsibus? target ? drive ? st* at scsibus? target ? drive ? cd* at scsibus? target ? drive ? +fdc0 at mainbus0 +fd* at fdc0 + pseudo-device loop pseudo-device pty 32 pseudo-device sl 2