pata_efar: fix PIO2 underclocking

[safe/jmp/linux-2.6] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 87355f5..a5049cf 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -37,6 +37,9 @@ obj-$(CONFIG_SCSI_SRP_ATTRS)  += scsi_transport_srp.o
 obj-$(CONFIG_SCSI_DH)          += device_handler/
 
 obj-$(CONFIG_LIBFC)            += libfc/
+obj-$(CONFIG_LIBFCOE)          += fcoe/
+obj-$(CONFIG_FCOE)             += fcoe/
+obj-$(CONFIG_FCOE_FNIC)                += fnic/
 obj-$(CONFIG_ISCSI_TCP)        += libiscsi.o   libiscsi_tcp.o iscsi_tcp.o
 obj-$(CONFIG_INFINIBAND_ISER)  += libiscsi.o
 obj-$(CONFIG_SCSI_A4000T)      += 53c700.o     a4000t.o
@@ -98,13 +101,13 @@ obj-$(CONFIG_SCSI_DC390T)  += tmscsim.o
 obj-$(CONFIG_MEGARAID_LEGACY)  += megaraid.o
 obj-$(CONFIG_MEGARAID_NEWGEN)  += megaraid/
 obj-$(CONFIG_MEGARAID_SAS)     += megaraid/
+obj-$(CONFIG_SCSI_MPT2SAS)     += mpt2sas/
 obj-$(CONFIG_SCSI_ACARD)       += atp870u.o
 obj-$(CONFIG_SCSI_SUNESP)      += esp_scsi.o   sun_esp.o
 obj-$(CONFIG_SCSI_GDTH)                += gdth.o
 obj-$(CONFIG_SCSI_INITIO)      += initio.o
 obj-$(CONFIG_SCSI_INIA100)     += a100u2w.o
 obj-$(CONFIG_SCSI_QLOGICPTI)   += qlogicpti.o
-obj-$(CONFIG_BLK_DEV_IDESCSI)  += ide-scsi.o
 obj-$(CONFIG_SCSI_MESH)                += mesh.o
 obj-$(CONFIG_SCSI_MAC53C94)    += mac53c94.o
 obj-$(CONFIG_BLK_DEV_3W_XXXX_RAID) += 3w-xxxx.o
@@ -125,6 +128,7 @@ obj-$(CONFIG_SCSI_HPTIOP)   += hptiop.o
 obj-$(CONFIG_SCSI_STEX)                += stex.o
 obj-$(CONFIG_SCSI_MVSAS)       += mvsas.o
 obj-$(CONFIG_PS3_ROM)          += ps3rom.o
+obj-$(CONFIG_SCSI_CXGB3_ISCSI) += libiscsi.o libiscsi_tcp.o cxgb3i/
 
 obj-$(CONFIG_ARM)              += arm/
 
@@ -136,6 +140,8 @@ obj-$(CONFIG_CHR_DEV_SG)    += sg.o
 obj-$(CONFIG_CHR_DEV_SCH)      += ch.o
 obj-$(CONFIG_SCSI_ENCLOSURE)   += ses.o
 
+obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/
+
 # This goes last, so that "real" scsi devices probe earlier
 obj-$(CONFIG_SCSI_DEBUG)       += scsi_debug.o