A few more tweaks to let non-GENERIC kernels (MVMEfoo) build as well with -Wall.

3 files changed, 12 insertions, 4 deletions

diff --git a/sys/arch/mvme68k/dev/clock.c b/sys/arch/mvme68k/dev/clock.c
index 6dc13da265c..2a9869e2a31 100644
--- a/sys/arch/mvme68k/dev/clock.c
+++ b/sys/arch/mvme68k/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.5 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: clock.c,v 1.6 2002/04/28 14:47:50 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -381,7 +381,9 @@ void
 delay(us)
 	int us;
 {
+#if (NPCC > 0) || (NPCCTWO > 0)
 	volatile register int c;
+#endif
 
 	switch (clockbus) {
 #if NPCC > 0
diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c
index 85aa2ea2ab0..37cb772c107 100644
--- a/sys/arch/mvme68k/dev/sram.c
+++ b/sys/arch/mvme68k/dev/sram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sram.c,v 1.9 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: sram.c,v 1.10 2002/04/28 14:47:50 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -93,7 +93,9 @@ sramattach(parent, self, args)
 {
 	struct confargs *ca = args;
 	struct sramsoftc *sc = (struct sramsoftc *)self;
+#ifdef MVME162
 	struct mcreg *mc;
+#endif
 
 	switch (cputyp) {
 #ifdef MVME162
diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c
index 89af7dab4e5..72fef07d142 100644
--- a/sys/arch/mvme68k/dev/vme.c
+++ b/sys/arch/mvme68k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.13 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.14 2002/04/28 14:47:50 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -89,9 +89,9 @@ vmematch(parent, cf, args)
 	void *cf;
 	void *args;
 {
+#if NMC > 0
 	struct confargs *ca = args;
 
-#if NMC > 0
 	if (ca->ca_bustype == BUS_MC) {
 		struct mcreg *mc = (struct mcreg *)ca->ca_master;
 
@@ -344,8 +344,12 @@ vmeattach(parent, self, args)
 {
 	struct vmesoftc *sc = (struct vmesoftc *)self;
 	struct confargs *ca = args;
+#if NPCC > 0
 	struct vme1reg *vme1;
+#endif
+#if NMC > 0 || NPCCTWO > 0
 	struct vme2reg *vme2;
+#endif
 	int scon;
 
 	sc->sc_vaddr = ca->ca_vaddr;