---

yaml --- r: 62745 b: refs/heads/master c: b914217 h: refs/heads/master i: 62743: 29371db v: v3
git-mirror · Jul 22, 2007 · 13b697d · 13b697d
1 parent 55f1f23
commit 13b697d
Show file tree

Hide file tree

Showing 7 changed files with 437 additions and 398 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e1703b9b88cf9b5e91cdd2f7dcded3ec3917cb
+refs/heads/master: b91421749a1840148d8c81637c03c0ace3f35269
diff --git a/trunk/drivers/scsi/libsas/Kconfig b/trunk/drivers/scsi/libsas/Kconfig
@@ -30,6 +30,13 @@ config SCSI_SAS_LIBSAS
 	  This provides transport specific helpers for SAS drivers which
 	  use the domain device construct (like the aic94xxx).
 
+config SCSI_SAS_ATA
+	bool "ATA support for libsas (requires libata)"
+	depends on SCSI_SAS_LIBSAS && ATA
+	help
+		Builds in ATA support into libsas.  Will necessitate
+		the loading of libata along with libsas.
+
 config SCSI_SAS_LIBSAS_DEBUG
 	bool "Compile the SAS Domain Transport Attributes in debug mode"
 	default y

diff --git a/trunk/drivers/scsi/libsas/Makefile b/trunk/drivers/scsi/libsas/Makefile
@@ -33,5 +33,5 @@ libsas-y +=  sas_init.o     \
 		sas_dump.o     \
 		sas_discover.o \
 		sas_expander.o \
-		sas_scsi_host.o \
-		sas_ata.o
+		sas_scsi_host.o
+libsas-$(CONFIG_SCSI_SAS_ATA) +=	sas_ata.o