Module Name: src
Committed By: phx
Date: Sun Oct 23 18:40:52 UTC 2016
Modified Files:
src/sys/arch/amiga/dev: mntva.c
Log Message:
Fixed WSCONS kernels. The cnprobe function must only be called when
MNTVA_CONSOLE is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/mntva.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/dev/mntva.c
diff -u src/sys/arch/amiga/dev/mntva.c:1.1 src/sys/arch/amiga/dev/mntva.c:1.2
--- src/sys/arch/amiga/dev/mntva.c:1.1 Mon Oct 3 14:26:02 2016
+++ src/sys/arch/amiga/dev/mntva.c Sun Oct 23 18:40:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mntva.c,v 1.1 2016/10/03 14:26:02 rkujawa Exp $ */
+/* $NetBSD: mntva.c,v 1.2 2016/10/23 18:40:52 phx Exp $ */
/*
* Copyright (c) 2012, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mntva.c,v 1.1 2016/10/03 14:26:02 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mntva.c,v 1.2 2016/10/23 18:40:52 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -593,6 +593,7 @@ mntvacninit(struct consdev *cd)
void
mntvacnprobe(struct consdev *cd)
{
+#ifdef MNTVA_CONSOLE
/*
* This isn't exactly true, but cons.h does not define anything
* that would fit our case exactly.
@@ -600,6 +601,7 @@ mntvacnprobe(struct consdev *cd)
cd->cn_pri = CN_INTERNAL;
cd->cn_dev = NODEV; /* Filled later by wscons. */
+#endif /* MNTVA_CONSOLE */
}
/* ARGSUSED */
