[src/netbsd-1-5]: src/sys/arch/mac68k/dev Pull up rev. 1.33:

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

details:   https://anonhg.NetBSD.org/src/rev/35819ffa13ae
branches:  netbsd-1-5
changeset: 488385:35819ffa13ae
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jul 03 22:24:13 2000 +0000

description:
Pull up rev. 1.33:
Fix logic bug which would keep PPS from working. Noticed by:

Charles Carvalho <carvalho%cisco.com@localhost>

diffstat:

 sys/arch/mac68k/dev/zs.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r f95867b1d7bc -r 35819ffa13ae sys/arch/mac68k/dev/zs.c
--- a/sys/arch/mac68k/dev/zs.c  Mon Jul 03 22:23:20 2000 +0000
+++ b/sys/arch/mac68k/dev/zs.c  Mon Jul 03 22:24:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.32 1999/11/02 06:51:45 scottr Exp $   */
+/*     $NetBSD: zs.c,v 1.32.6.1 2000/07/03 22:24:13 thorpej Exp $      */
 
 /*
  * Copyright (c) 1996-1998 Bill Studenmund
@@ -738,7 +738,7 @@
                 * Enable only if nothing else will want the interrupt and
                 * it's ok to enable interrupts on this line.
                 */
-               if ((cflag & (CLOCAL & MDMBUF)) == CLOCAL)
+               if ((cflag & (CLOCAL | MDMBUF)) == CLOCAL)
                        cs->cs_rr0_pps = ZSRR0_DCD;
        }
        if ((xcs->cs_hwflags & ZS_HWFLAG_NO_CTS) && (cflag & (CRTSCTS | CDTRCTS)))