Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 669ff6b99c4f..84d546323dc7 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -33,7 +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_ISCSI_TCP)         += libiscsi.o   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
@@ -136,6 +136,7 @@ obj-$(CONFIG_SCSI_SATA_NV)	+= libata.o sata_nv.o
 obj-$(CONFIG_SCSI_SATA_ULI)     += libata.o sata_uli.o
 obj-$(CONFIG_SCSI_SATA_MV)      += libata.o sata_mv.o
 obj-$(CONFIG_SCSI_PDC_ADMA)     += libata.o pdc_adma.o
+obj-$(CONFIG_SCSI_HPTIOP)       += hptiop.o
 
 obj-$(CONFIG_ARM)               += arm/