3 files changed, 14 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c2ca1dc66f2..e26fb02ac759 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3291,6 +3291,16 @@ L:	orinoco-devel@lists.sourceforge.net
 W:      http://www.nongnu.org/orinoco/
 S:      Maintained
 
+OSD LIBRARY
+P:      Boaz Harrosh
+M:      bharrosh@panasas.com
+P:      Benny Halevy
+M:      bhalevy@panasas.com
+L:      osd-dev@open-osd.org
+W:      http://open-osd.org
+T:      git://git.open-osd.org/open-osd.git
+S:      Maintained
+
 P54 WIRELESS DRIVER
 P:      Michael Wu
 M:      flamingice@sourmilk.net
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 601c2a8ec242..e420ad0acebf 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1806,4 +1806,6 @@ source "drivers/scsi/pcmcia/Kconfig"
 
 source "drivers/scsi/device_handler/Kconfig"
 
+source "drivers/scsi/osd/Kconfig"
+
 endmenu
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 7461eb09a031..05558b170419 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -137,6 +137,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