summaryrefslogtreecommitdiff
path: root/sys/arch/amiga/conf
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-04 23:34:59 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-04 23:34:59 +0000
commit336aa88c94f8c10484b22ec84f1178d0dc52e8c3 (patch)
treea78db61d41a3df6c542783c4ab4fcb3e57d9ac0e /sys/arch/amiga/conf
parent6844facfb2d8171043e78487574361a8fd1bbd43 (diff)
Merge of NetBSD 1.2 (961004)
Diffstat (limited to 'sys/arch/amiga/conf')
-rw-r--r--sys/arch/amiga/conf/DRACO6
-rw-r--r--sys/arch/amiga/conf/GENERIC6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index 7635bf3ee2d..9f06343440d 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,5 +1,5 @@
-# $OpenBSD: DRACO,v 1.5 1996/10/04 15:05:39 niklas Exp $
-# $NetBSD: DRACO,v 1.2.4.1 1996/05/30 21:25:55 is Exp $
+# $OpenBSD: DRACO,v 1.6 1996/10/04 23:34:44 niklas Exp $
+# $NetBSD: DRACO,v 1.2.4.2 1996/09/06 00:28:31 jtc Exp $
#
# Macro System GmbH "DraCo", currently 68060-only until FPE is integrated.
@@ -123,6 +123,8 @@ option RETINACONSOLE # enable code to allow retina to be console
#option RH_64BIT_SPRITE
# enables fast scroll code appears to now work on 040 systems.
#option RETINA_SPEED_HACK
+# enables the Hardwarecursor which does not work on some systems.
+#option RH_HARDWARECURSOR
grfrh0 at zbus0 # Altais looks just like the Retina Z3
grf2 at grfrh0
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 901e3231b72..02bf4b222da 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,5 +1,5 @@
-# $OpenBSD: GENERIC,v 1.13 1996/10/04 15:04:51 niklas Exp $
-# $NetBSD: GENERIC,v 1.57.4.3 1996/06/04 10:32:59 is Exp $
+# $OpenBSD: GENERIC,v 1.14 1996/10/04 23:34:46 niklas Exp $
+# $NetBSD: GENERIC,v 1.57.4.4 1996/09/06 00:34:18 jtc Exp $
#
# GENERIC AMIGA
@@ -97,6 +97,8 @@ option GRF_AGA # AGA Chip Set
#option RH_64BIT_SPRITE
# enables fast scroll code appears to now work on 040 systems.
#option RETINA_SPEED_HACK
+# enables the Hardwarecursor which does not work on some systems.
+#option RH_HARDWARECURSOR
grfcc0 at mainbus0 # custom chips
grfrt0 at zbus0 # retina II