Merge remote-tracking branch 'net/master'

[linux-2.6-microblaze.git] / drivers / scsi / Makefile

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index fcb41ae..8826111 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -150,7 +150,6 @@ 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/
 obj-$(CONFIG_SCSI_HISI_SAS) += hisi_sas/
 
 # This goes last, so that "real" scsi devices probe earlier