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 6383eb58d890590966cf6380cd3c8d3bb8166fab..fd387b91856edf97c6a84b6106ab6329e4c599ab 100644 (file)
--- a/drivers/scsi/libsas/Makefile
+++ b/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