summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k/conf/GENERIC
diff options
context:
space:
mode:
authorbriggs <briggs@cvs.openbsd.org>1996-10-14 02:43:54 +0000
committerbriggs <briggs@cvs.openbsd.org>1996-10-14 02:43:54 +0000
commit7e79cffeb4ca747958b5aef865b6d28a2408665f (patch)
tree76e4cf340249f09ac56d98a4ed92de52ae4c050d /sys/arch/mac68k/conf/GENERIC
parent6b452ba479b123d389c56fbd5e31f3234e3a6e69 (diff)
Nuke old COMPAT options. Move MACHINE_NONCONTIG to std.mac68k.
Diffstat (limited to 'sys/arch/mac68k/conf/GENERIC')
-rw-r--r--sys/arch/mac68k/conf/GENERIC21
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 1a466149516..e1634fb6c6f 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,5 +1,5 @@
-# $OpenBSD: GENERIC,v 1.9 1996/09/20 06:45:11 deraadt Exp $
-# $NetBSD: GENERIC,v 1.38 1996/08/05 01:52:13 scottr Exp $
+# $OpenBSD: GENERIC,v 1.10 1996/10/14 02:43:50 briggs Exp $
+# $NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $
#
# GENERIC
@@ -44,7 +44,6 @@ options GATEWAY # IP packet forwarding
#options ISO # OSI networking
#options TPIP
#options EON
-options COMPAT_42
options COMPAT_43
options NS
options MAPMEM
@@ -59,9 +58,7 @@ options FPSP
options FPU_EMULATE
options COMPAT_NOMID
options COMPAT_SUNOS
-options COMPAT_09
-options COMPAT_10
-options MACHINE_NONCONTIG
+options ZS_CONSOLE_ABORT
config bsd swap generic
options GENERIC
@@ -84,12 +81,12 @@ ncrscsi0 at obio? # SCSI NCR 5380
ncr96scsi0 at obio? # SCSI NCR 53C96
scsibus* at scsi?
-sd* at scsibus? target ? lun ?
-st* at scsibus? target ? lun ?
-cd* at scsibus? target ? lun ?
-ch* at scsibus? target ? lun ?
-ss* at scsibus? target ? lun ?
-uk* at scsibus? target ? lun ?
+sd* at scsibus? target ? lun ? # SCSI disk drives
+st* at scsibus? target ? lun ? # SCSI tape drives
+cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+ch* at scsibus? target ? lun ? # SCSI autochangers
+ss* at scsibus? target ? lun ? # SCSI scanners
+uk* at scsibus? target ? lun ? # SCSI unknown
pseudo-device pty 16
pseudo-device bpfilter 12