PR port-sparc/39942: ifdef ch0_is_cons declaration and all uses consistently

This commit is contained in:
martin 2008-11-17 18:32:08 +00:00
parent a61fa1fd53
commit ae7357a3ad
1 changed files with 6 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.111 2008/06/13 13:10:18 cegger Exp $ */
/* $NetBSD: zs.c,v 1.112 2008/11/17 18:32:08 martin Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.111 2008/06/13 13:10:18 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.112 2008/11/17 18:32:08 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -397,7 +397,9 @@ zs_attach(struct zsc_softc *zsc, struct zsdevice *zsd, int pri)
struct zs_chanstate *cs;
int s, channel;
static int didintr, prevpri;
#if (NKBD > 0) || (NMS > 0)
int ch0_is_cons = 0;
#endif
if (zsd == NULL) {
aprint_error(": configuration incomplete\n");
@ -454,7 +456,9 @@ zs_attach(struct zsc_softc *zsc, struct zsdevice *zsd, int pri)
if (zsc->zsc_promunit == 1) {
if ((hwflags & ZS_HWFLAG_CONSOLE_INPUT) != 0 &&
!channel) {
#if (NKBD > 0) || (NMS > 0)
ch0_is_cons = 1;
#endif
}
} else {
zsc_args.hwflags = hwflags;