[SCSI] scsi: Add osd library to build system

OSD in kernel source code is assumed to be at:
drivers/scsi/osd/ with its own Makefile and Kconfig

Add includes to them from drivers/scsi Makefile and Kconfig
Add OSD to MAINTAINERS file

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Reviewed-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c2ca1dc66f2006765dba54bb05edf8a5b57d258..e26fb02ac759e2644afdf5a1ea575506e0434253 100644 (file)
--- 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 601c2a8ec24288d249fa3c81b8f5e01c91ccb9d1..e420ad0acebf49296f3e5695d59952e10a4af88c 100644 (file)
--- 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 7461eb09a031080b517de0fba9367eedbcf637d5..05558b1704199a654428f81bb31e48f76f08b42c 100644 (file)
--- 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