Index: sys/amd64/conf/NOTES
===================================================================
--- sys/amd64/conf/NOTES
+++ sys/amd64/conf/NOTES
@@ -462,6 +462,8 @@
 # LSI-Logic MPT-Fusion drivers
 device		mpt			# LSI-Logic MPT-Fusion
 device		mps			# LSI-Logic MPT-Fusion 2
+# Default debugging options for mps
+options		MPS_DEBUG_FLAGS=MPS_INFO|MPS_FAULT|MPS_EVENT|MPS_LOG|MPS_RECOVERY|MPS_ERROR|MPS_INIT|MPS_XINFO|MPS_USER|MPS_MAPPING|MPS_TRACE
 device		mpr			# LSI-Logic MPT-Fusion 3
 
 #
Index: sys/conf/options
===================================================================
--- sys/conf/options
+++ sys/conf/options
@@ -179,6 +179,7 @@
 MFI_DECODE_LOG	opt_mfi.h
 MPROF_BUFFERS	opt_mprof.h
 MPROF_HASH_SIZE	opt_mprof.h
+MPS_DEBUG_FLAGS	opt_mps.h
 NEW_PCIB	opt_global.h
 NO_ADAPTIVE_MUTEXES	opt_adaptive_mutexes.h
 NO_ADAPTIVE_RWLOCKS
Index: sys/dev/mps/mps.c
===================================================================
--- sys/dev/mps/mps.c
+++ sys/dev/mps/mps.c
@@ -37,6 +37,8 @@
 
 /* Communications core for Avago Technologies (LSI) MPT2 */
 
+#include "opt_mps.h"
+
 /* TODO Move headers to mpsvar */
 #include <sys/types.h>
 #include <sys/param.h>
@@ -115,6 +117,10 @@
 MALLOC_DEFINE(M_MPT2, "mps", "mpt2 driver memory");
 MALLOC_DECLARE(M_MPSUSER);
 
+#ifndef MPS_DEBUG_FLAGS
+#define MPS_DEBUG_FLAGS (MPS_INFO | MPS_FAULT)
+#endif
+
 /*
  * Do a "Diagnostic Reset" aka a hard reset.  This should get the chip out of
  * any state and back to its initialization state machine.
@@ -1580,7 +1586,7 @@
 	char tmpstr[80], mps_debug[80];
 
 	/* XXX default to some debugging for now */
-	sc->mps_debug = MPS_INFO|MPS_FAULT;
+	sc->mps_debug = MPS_DEBUG_FLAGS;
 	sc->disable_msix = 0;
 	sc->disable_msi = 0;
 	sc->max_msix = MPS_MSIX_MAX;
Index: sys/i386/conf/NOTES
===================================================================
--- sys/i386/conf/NOTES
+++ sys/i386/conf/NOTES
@@ -693,6 +693,8 @@
 # LSI-Logic MPT-Fusion drivers
 device		mpt			# LSI-Logic MPT-Fusion
 device		mps			# LSI-Logic MPT-Fusion 2
+# Default debugging options for mps
+options		MPS_DEBUG_FLAGS=MPS_INFO|MPS_FAULT|MPS_EVENT|MPS_LOG|MPS_RECOVERY|MPS_ERROR|MPS_INIT|MPS_XINFO|MPS_USER|MPS_MAPPING|MPS_TRACE
 device		mpr			# LSI-Logic MPT-Fusion 3
 
 #
Index: sys/modules/mps/Makefile
===================================================================
--- sys/modules/mps/Makefile
+++ sys/modules/mps/Makefile
@@ -5,7 +5,7 @@
 KMOD=	mps
 SRCS=	mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c
 SRCS+=	mps_config.c mps_mapping.c mps_sas_lsi.c
-SRCS+=	opt_cam.h
+SRCS+=	opt_cam.h opt_mps.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 #CFLAGS += -DMPS_DEBUG
Index: sys/sparc64/conf/NOTES
===================================================================
--- sys/sparc64/conf/NOTES
+++ sys/sparc64/conf/NOTES
@@ -88,6 +88,8 @@
 # LSI-Logic MPT-Fusion drivers
 device		mpt			# LSI-Logic MPT-Fusion
 device		mps			# LSI-Logic MPT-Fusion 2
+# Default debugging options for mps
+options		MPS_DEBUG_FLAGS=MPS_INFO|MPS_FAULT|MPS_EVENT|MPS_LOG|MPS_RECOVERY|MPS_ERROR|MPS_INIT|MPS_XINFO|MPS_USER|MPS_MAPPING|MPS_TRACE
 device		mpr			# LSI-Logic MPT-Fusion 3