Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-4]: src/sys/arch/alpha/alpha Pull up 1.25 -> 1.26.



details:   https://anonhg.NetBSD.org/src/rev/df06b8689953
branches:  netbsd-1-4
changeset: 468301:df06b8689953
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Apr 16 23:10:35 1999 +0000

description:
Pull up 1.25 -> 1.26.

diffstat:

 sys/arch/alpha/alpha/dec_3000_300.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 0bdbfcbffbff -r df06b8689953 sys/arch/alpha/alpha/dec_3000_300.c
--- a/sys/arch/alpha/alpha/dec_3000_300.c       Fri Apr 16 23:10:07 1999 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_300.c       Fri Apr 16 23:10:35 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_300.c,v 1.25 1999/03/28 13:48:40 drochner Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.25.2.1 1999/04/16 23:10:35 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.25 1999/03/28 13:48:40 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.25.2.1 1999/04/16 23:10:35 thorpej Exp $");
 
 #include "opt_new_scc_driver.h"
 
@@ -102,8 +102,9 @@
        case CTB_GRAPHICS:
 #if NWSDISPLAY > 0
                /* display console ... */
-               if (zs_ioasic_lk201_cnattach(0x1a0000000, 0x00180000, 0)
-                   && tc_3000_300_fb_cnattach(ctb->ctb_turboslot)) {
+               if (zs_ioasic_lk201_cnattach(0x1a0000000, 0x00180000, 0) &&
+                   tc_3000_300_fb_cnattach(
+                    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot))) {
                        break;
                }
 #endif



Home | Main Index | Thread Index | Old Index