3 files changed, 6 insertions, 2 deletions

diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 8d25a71393e9..ff564f123f9c 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -483,14 +483,14 @@ aac_intr(void *arg)
 
     /* controller has a message for us? */
     if (reason & AAC_DB_COMMAND_READY) {
-	aac_host_command(sc);
 	AAC_CLEAR_ISTATUS(sc, AAC_DB_COMMAND_READY);
+	aac_host_command(sc);
     }
     
     /* controller has a response for us? */
     if (reason & AAC_DB_RESPONSE_READY) {
-	aac_host_response(sc);
 	AAC_CLEAR_ISTATUS(sc, AAC_DB_RESPONSE_READY);
+	aac_host_response(sc);
     }
 
     /* spurious interrupts that we don't use - reset the mask and clear the interrupts */
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index 3298502bb300..d4b7cb988c39 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -47,6 +47,7 @@
 #include <dev/aac/aac_ioctl.h>
 #include <dev/aac/aacvar.h>
 
+#ifdef AAC_DEBUG
 void		aac_printstate0(void);
 void		aac_intr0(void);
 
@@ -434,3 +435,4 @@ aac_print_aif(struct aac_softc *sc, struct aac_aif_command *aif)
 	break;
     }
 }
+#endif
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index 0869ccb3909b..2870531d3a08 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -95,6 +95,8 @@
  ********************************************************************************
  ********************************************************************************/
 
+#include "opt_aac.h"
+
 #if __FreeBSD_version >= 500005
 # include <sys/taskqueue.h>
 #endif