Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'

[karo-tx-linux.git] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 59f1ce6df2d6461af2136a784252f44d0dc351c1..58158f11ed7b5eb4f0d6c9dd30118510ed918022 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -100,7 +100,7 @@ obj-$(CONFIG_SCSI_EATA_PIO) += eata_pio.o
 obj-$(CONFIG_SCSI_7000FASST)   += wd7000.o
 obj-$(CONFIG_SCSI_EATA)                += eata.o
 obj-$(CONFIG_SCSI_DC395x)      += dc395x.o
-obj-$(CONFIG_SCSI_DC390T)      += tmscsim.o
+obj-$(CONFIG_SCSI_AM53C974)    += esp_scsi.o   am53c974.o
 obj-$(CONFIG_MEGARAID_LEGACY)  += megaraid.o
 obj-$(CONFIG_MEGARAID_NEWGEN)  += megaraid/
 obj-$(CONFIG_MEGARAID_SAS)     += megaraid/
@@ -143,6 +143,7 @@ obj-$(CONFIG_SCSI_VIRTIO)   += virtio_scsi.o
 obj-$(CONFIG_VMWARE_PVSCSI)    += vmw_pvscsi.o
 obj-$(CONFIG_XEN_SCSI_FRONTEND)        += xen-scsifront.o
 obj-$(CONFIG_HYPERV_STORAGE)   += hv_storvsc.o
+obj-$(CONFIG_SCSI_WD719X)      += wd719x.o
 
 obj-$(CONFIG_ARM)              += arm/