Module Name: src
Committed By: shattered
Date: Fri Dec 2 18:07:26 UTC 2011
Modified Files:
src/sys/arch/hpcmips/tx: tx39.c
Log Message:
PR/32394 -- Don't define 'panic' label unconditionally, or "minimal
mobilepro 780 kernel configuration will not build".
OK by wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hpcmips/tx/tx39.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/hpcmips/tx/tx39.c
diff -u src/sys/arch/hpcmips/tx/tx39.c:1.43 src/sys/arch/hpcmips/tx/tx39.c:1.44
--- src/sys/arch/hpcmips/tx/tx39.c:1.43 Sat Feb 26 12:07:45 2011
+++ src/sys/arch/hpcmips/tx/tx39.c Fri Dec 2 18:07:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $ */
+/* $NetBSD: tx39.c,v 1.44 2011/12/02 18:07:26 shattered Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.44 2011/12/02 18:07:26 shattered Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -285,7 +285,9 @@ tx_cons_init(void)
}
return;
+#if (NM38813C > 0) || (NTC5165BUF > 0)
panic:
+#endif
panic("tx_cons_init: can't init console");
/* NOTREACHED */
}
