diff options
author | briggs <briggs@cvs.openbsd.org> | 1997-03-08 16:17:07 +0000 |
---|---|---|
committer | briggs <briggs@cvs.openbsd.org> | 1997-03-08 16:17:07 +0000 |
commit | ff0673c19523d5b6bd01a362faa04af8f4ca9c13 (patch) | |
tree | 445632a2a4924f1e56bf8949a24dd9db30df5336 /sys/arch/mac68k/conf/GENERIC | |
parent | 4c4f43623ba216b0bf625d16ef1c4eb0f8eb529c (diff) |
Sync with NetBSD of about 4 March.
Diffstat (limited to 'sys/arch/mac68k/conf/GENERIC')
-rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index c4273760cd9..79376f024a7 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.14 1997/01/24 01:35:24 briggs Exp $ +# $OpenBSD: GENERIC,v 1.15 1997/03/08 16:16:46 briggs Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC @@ -57,12 +57,14 @@ options COMPAT_NOMID options COMPAT_SUNOS options ZS_CONSOLE_ABORT options DISABLE_EXT_CACHE # Don't use IIci external cache +options HWDIRECT config bsd swap generic options GENERIC sn0 at obio? # SONIC ethernet (68040) +asc0 at obio? # ASC/EASC audio intvid0 at obio? # Internal video hardware nubus0 at mainbus? |