Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[linux-2.6] / drivers / scsi / libsas / Makefile

diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
index 44d972a3b4bda38777f379437cbb76542ee6a938..fd387b91856edf97c6a84b6106ab6329e4c599ab 100644 (file)
--- a/drivers/scsi/libsas/Makefile
+++ b/drivers/scsi/libsas/Makefile
@@ -34,3 +34,4 @@ libsas-y +=  sas_init.o     \
                sas_discover.o \
                sas_expander.o \
                sas_scsi_host.o
+libsas-$(CONFIG_SCSI_SAS_ATA) +=       sas_ata.o