Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 2d4439826c08..b88b8c455598 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_SCSI_FC_ATTRS) 	+= scsi_transport_fc.o
 obj-$(CONFIG_SCSI_ISCSI_ATTRS)  += scsi_transport_iscsi.o
 obj-$(CONFIG_SCSI_SAS_ATTRS)    += scsi_transport_sas.o
 
+obj-$(CONFIG_ISCSI_TCP)         += iscsi_tcp.o
 obj-$(CONFIG_SCSI_AMIGA7XX)     += amiga7xx.o   53c7xx.o
 obj-$(CONFIG_A3000_SCSI)        += a3000.o      wd33c93.o
 obj-$(CONFIG_A2091_SCSI)        += a2091.o      wd33c93.o
@@ -119,7 +120,6 @@ obj-$(CONFIG_JAZZ_ESP)		+= NCR53C9x.o	jazz_esp.o
 obj-$(CONFIG_SUN3X_ESP)         += NCR53C9x.o   sun3x_esp.o
 obj-$(CONFIG_SCSI_DEBUG)        += scsi_debug.o
 obj-$(CONFIG_SCSI_FCAL)         += fcal.o
-obj-$(CONFIG_SCSI_CPQFCTS)      += cpqfc.o
 obj-$(CONFIG_SCSI_LASI700)      += 53c700.o lasi700.o
 obj-$(CONFIG_SCSI_NSP32)        += nsp32.o
 obj-$(CONFIG_SCSI_IPR)          += ipr.o
@@ -164,8 +164,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
 CFLAGS_ncr53c8xx.o      := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
 zalon7xx-objs   := zalon.o ncr53c8xx.o
 NCR_Q720_mod-objs       := NCR_Q720.o ncr53c8xx.o
-cpqfc-objs      := cpqfcTSinit.o cpqfcTScontrol.o cpqfcTSi2c.o \
-                   cpqfcTSworker.o cpqfcTStrigger.o
 libata-objs     := libata-core.o libata-scsi.o
 
 # Files generated that shall be removed upon make clean