[src/trunk]: src/sys/arch/amiga CV3DONZORRO2 option is no longer needed.

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5940250d1e15
branches:  trunk
changeset: 782085:5940250d1e15
user:      phx <phx%NetBSD.org@localhost>
date:      Sun Oct 14 20:33:17 2012 +0000

description:
CV3DONZORRO2 option is no longer needed.
grf_cv3d.c was successfully tested running in a Zorro2 slot.

diffstat:

 sys/arch/amiga/conf/files.amiga |   3 +--
 sys/arch/amiga/dev/grf_cv3d.c   |  10 ++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r eafffd2ae755 -r 5940250d1e15 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Sun Oct 14 19:17:08 2012 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Sun Oct 14 20:33:17 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amiga,v 1.161 2012/10/14 13:36:07 phx Exp $
+#      $NetBSD: files.amiga,v 1.162 2012/10/14 20:33:17 phx Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16                       # NOTE THAT AMIGA IS SPECIAL!
@@ -18,7 +18,6 @@
 
 defflag        opt_amigacons.h         RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
 defflag        opt_amigacons.h         CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
-defflag        opt_amigacons.h         CV3DONZORRO2
 defflag        opt_amigacons.h         SERCONSOLE
 
 defflag        opt_kfont.h             KFONT_CONS_ISO8859_1
diff -r eafffd2ae755 -r 5940250d1e15 sys/arch/amiga/dev/grf_cv3d.c
--- a/sys/arch/amiga/dev/grf_cv3d.c     Sun Oct 14 19:17:08 2012 +0000
+++ b/sys/arch/amiga/dev/grf_cv3d.c     Sun Oct 14 20:33:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cv3d.c,v 1.26 2011/12/15 14:25:13 phx Exp $ */
+/*     $NetBSD: grf_cv3d.c,v 1.27 2012/10/14 20:33:17 phx Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.26 2011/12/15 14:25:13 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.27 2012/10/14 20:33:17 phx Exp $");
 
 #include "ite.h"
 #include "wsdisplay.h"
@@ -406,12 +406,6 @@
        if (zap->manid != 8512 || zap->prodid != 67)
                return (0);
 
-#ifndef CV3DONZORRO2
-       if (!cv3d_zorroIII) {
-               return (0);
-       }
-#endif
-
        cv3d_boardaddr = zap->va;
 
 #ifdef CV3DCONSOLE