Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/sys/arch/amiga Pull up following revision(s) (requested b...
details: https://anonhg.NetBSD.org/src/rev/9f77e8160a00
branches: netbsd-6
changeset: 775480:9f77e8160a00
user: riz <riz%NetBSD.org@localhost>
date: Thu Nov 22 00:23:35 2012 +0000
description:
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.
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 bc8b19ce6b11 -r 9f77e8160a00 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga Wed Nov 21 15:57:20 2012 +0000
+++ b/sys/arch/amiga/conf/files.amiga Thu Nov 22 00:23:35 2012 +0000
@@ -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_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 bc8b19ce6b11 -r 9f77e8160a00 sys/arch/amiga/dev/grf_cv3d.c
--- a/sys/arch/amiga/dev/grf_cv3d.c Wed Nov 21 15:57:20 2012 +0000
+++ b/sys/arch/amiga/dev/grf_cv3d.c Thu Nov 22 00:23:35 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.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 @@
if (zap->manid != 8512 || zap->prodid != 67)
return (0);
-#ifndef CV3DONZORRO2
- if (!cv3d_zorroIII) {
- return (0);
- }
-#endif
-
cv3d_boardaddr = zap->va;
#ifdef CV3DCONSOLE
Home |
Main Index |
Thread Index |
Old Index