3 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/hppa/dev/asp.c b/sys/arch/hppa/dev/asp.c
index 40c5ac92f91..57909236b28 100644
--- a/sys/arch/hppa/dev/asp.c
+++ b/sys/arch/hppa/dev/asp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asp.c,v 1.9 2002/12/18 23:52:45 mickey Exp $	*/
+/*	$OpenBSD: asp.c,v 1.10 2003/02/18 09:40:40 miod Exp $	*/
 
 /*
  * Copyright (c) 1998-2002 Michael Shalayeff
@@ -177,8 +177,10 @@ aspattach(parent, self, aux)
 	sc->sc_trs = (struct asp_trs *)ASP_CHPA;
 	sc->sc_hw = (struct asp_hwr *)ca->ca_hpa;
 
+#ifdef USELEDS
 	machine_ledaddr = &sc->sc_trs->asp_cled;
 	machine_ledword = asp_spus[sc->sc_trs->asp_spu].ledword;
+#endif
 
 	/* reset ASP */
 	/* sc->sc_hw->asp_reset = 1; */
diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index d799c69c2ae..2b32d1492f1 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.98 2003/02/05 18:54:22 mickey Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.99 2003/02/18 09:40:43 miod Exp $	*/
 
 /*
  * Copyright (c) 1998-2003 Michael Shalayeff
@@ -655,7 +655,9 @@ void
 pmap_destroy(pmap)
 	struct pmap *pmap;
 {
+#ifdef DIAGNOSTIC
 	struct vm_page *pg;
+#endif
 	int refs;
 
 	DPRINTF(PDB_FOLLOW|PDB_PMAP, ("pmap_destroy(%p)\n", pmap));
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index 05f8dd87724..4e77a3b9770 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.59 2003/01/22 18:16:34 mickey Exp $	*/
+/*	$OpenBSD: trap.c,v 1.60 2003/02/18 09:40:43 miod Exp $	*/
 
 /*
  * Copyright (c) 1998-2003 Michael Shalayeff
@@ -49,8 +49,8 @@
 
 #include <machine/autoconf.h>
 
+#include <machine/db_machdep.h>	/* XXX always needed for inst_store() */
 #ifdef DDB
-#include <machine/db_machdep.h>
 #ifdef TRAPDEBUG
 #include <ddb/db_output.h>
 #endif