Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 8f86c1b96ff7777a6fda9dfda5ee4eab043cc8b8..79ecf4ebe6ebea59b3b662f88ae6fae2d15a526c 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -124,9 +124,12 @@ obj-$(CONFIG_JAZZ_ESP)             += NCR53C9x.o   jazz_esp.o
 obj-$(CONFIG_SUN3X_ESP)                += NCR53C9x.o   sun3x_esp.o
 obj-$(CONFIG_SCSI_FCAL)                += fcal.o
 obj-$(CONFIG_SCSI_LASI700)     += 53c700.o lasi700.o
+obj-$(CONFIG_SCSI_SNI_53C710)  += 53c700.o sni_53c710.o
 obj-$(CONFIG_SCSI_NSP32)       += nsp32.o
 obj-$(CONFIG_SCSI_IPR)         += ipr.o
+obj-$(CONFIG_SCSI_SRP)         += libsrp.o
 obj-$(CONFIG_SCSI_IBMVSCSI)    += ibmvscsi/
+obj-$(CONFIG_SCSI_IBMVSCSIS)   += ibmvscsi/
 obj-$(CONFIG_SCSI_HPTIOP)      += hptiop.o
 obj-$(CONFIG_SCSI_STEX)                += stex.o