Module Name: src
Committed By: riz
Date: Thu Nov 22 00:23:35 UTC 2012
Modified Files:
src/sys/arch/amiga/conf [netbsd-6]: files.amiga
src/sys/arch/amiga/dev [netbsd-6]: grf_cv3d.c
Log Message:
Pull up following revision(s) (requested by phx in ticket #680):
sys/arch/amiga/dev/grf_cv3d.c: revision 1.27
sys/arch/amiga/conf/files.amiga: revision 1.162
CV3DONZORRO2 option is no longer needed.
grf_cv3d.c was successfully tested running in a Zorro2 slot.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/amiga/dev/grf_cv3d.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.154 src/sys/arch/amiga/conf/files.amiga:1.154.2.1
--- src/sys/arch/amiga/conf/files.amiga:1.154 Tue Jan 24 00:19:39 2012
+++ src/sys/arch/amiga/conf/files.amiga Thu Nov 22 00:23:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.154 2012/01/24 00:19:39 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.154.2.1 2012/11/22 00:23:35 riz Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -18,7 +18,6 @@ defflag opt_amigaccgrf.h USE_C_BFOPS
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
Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.26 src/sys/arch/amiga/dev/grf_cv3d.c:1.26.2.1
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.26 Thu Dec 15 14:25:13 2011
+++ src/sys/arch/amiga/dev/grf_cv3d.c Thu Nov 22 00:23:35 2012
@@ -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.26.2.1 2012/11/22 00:23:35 riz 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.26.2.1 2012/11/22 00:23:35 riz Exp $");
#include "ite.h"
#include "wsdisplay.h"
@@ -406,12 +406,6 @@ grfcv3dmatch(struct device *pdp, struct
if (zap->manid != 8512 || zap->prodid != 67)
return (0);
-#ifndef CV3DONZORRO2
- if (!cv3d_zorroIII) {
- return (0);
- }
-#endif
-
cv3d_boardaddr = zap->va;
#ifdef CV3DCONSOLE
