summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-07-29 18:08:16 +0000
committernjl <njl@FreeBSD.org>2003-07-29 18:08:16 +0000
commit15f4d540c98cc4d06252e8eb7c283bbe6bdc88db (patch)
treed3243fb13c8ed10fb4f6e4b4bcd9f96d25b9ea24 /sys
parentb7cb53387d226e768ec2895b2cb3e572259ecc3b (diff)
downloadFreeBSD-src-15f4d540c98cc4d06252e8eb7c283bbe6bdc88db.zip
FreeBSD-src-15f4d540c98cc4d06252e8eb7c283bbe6bdc88db.tar.gz
Fix the new DA_OLD_QUIRKS option for normal and module compiles.
Pointed out by: bde
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/scsi/scsi_da.c1
-rw-r--r--sys/conf/options5
-rw-r--r--sys/modules/cam/Makefile1
3 files changed, 4 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index be6dda9..ca7c6e5 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 6b65a3a..4d09c82 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 0f0d238..be14b61 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
OpenPOWER on IntegriCloud