diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index be6dda9364c..ca7c6e55c64 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -30,6 +30,7 @@
 __FBSDID("$FreeBSD$");
 
 #ifdef _KERNEL
+#include "opt_da.h"
 #include "opt_hw_wdog.h"
 #endif /* _KERNEL */
 
diff --git a/sys/conf/options b/sys/conf/options
index 6b65a3a647b..4d09c822396 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -254,13 +254,12 @@ SCSI_DELAY		opt_scsi.h
 SCSI_NO_SENSE_STRINGS	opt_scsi.h
 SCSI_NO_OP_STRINGS	opt_scsi.h
 
-# Options used only in cam/scsi/scsi_da.c
-DA_OLD_QUIRKS		opt_scsi.h
-
 # Options used only in cam/scsi/scsi_cd.c
 CHANGER_MIN_BUSY_SECONDS	opt_cd.h
 CHANGER_MAX_BUSY_SECONDS	opt_cd.h
 
+DA_OLD_QUIRKS		opt_da.h
+
 # Options used only in cam/scsi/scsi_sa.c.
 SA_IO_TIMEOUT		opt_sa.h
 SA_SPACE_TIMEOUT	opt_sa.h
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index 0f0d2385626..be14b61044e 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -11,6 +11,7 @@ KMOD=	cam
 SRCS=	opt_cam.h
 SRCS+=	opt_scsi.h
 SRCS+=	opt_cd.h
+SRCS+=	opt_da.h
 SRCS+=	opt_hw_wdog.h
 SRCS+=	opt_pt.h
 SRCS+=	opt_sa.h