summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/mvme88k/dev/vme.c4
-rw-r--r--sys/arch/mvme88k/mvme88k/m8820x.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index b50ba20db04..59a5d7e6b04 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vme.c,v 1.46 2007/03/22 18:52:38 miod Exp $ */
+/* $OpenBSD: vme.c,v 1.47 2007/11/17 05:33:38 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -459,7 +459,9 @@ u_int vmevec_hints[8] = {
int
vmeintr_establish(int vec, struct intrhand *ih, const char *name)
{
+#if NPCCTWO > 0
struct vmesoftc *sc = (struct vmesoftc *) vme_cd.cd_devs[0];
+#endif
int rc;
#ifdef DIAGNOSTIC
diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c
index 6c743d98ada..0208c214cd8 100644
--- a/sys/arch/mvme88k/mvme88k/m8820x.c
+++ b/sys/arch/mvme88k/mvme88k/m8820x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m8820x.c,v 1.47 2006/11/18 22:53:11 miod Exp $ */
+/* $OpenBSD: m8820x.c,v 1.48 2007/11/17 05:33:40 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -83,12 +83,13 @@ void
m8820x_setup_board_config()
{
extern u_int32_t pfsr_save[];
- struct m8820x_cmmu *cmmu;
- int num, cmmu_num;
+ int num;
int vme188_config;
u_int32_t *m8820x_pfsr;
#ifdef MVME188
u_int32_t whoami;
+ struct m8820x_cmmu *cmmu;
+ int cmmu_num;
#endif
switch (brdtyp) {
@@ -272,7 +273,9 @@ m8820x_cpu_number()
#endif
#ifdef MVME187
+#ifdef MVME188
if (brdtyp != BRD_188)
+#endif
return 0;
#endif