diff options
| author | Boaz Harrosh | 2009-01-25 17:24:14 +0200 |
|---|---|---|
| committer | James Bottomley | 2009-03-12 12:58:09 -0500 |
| commit | 68274794c69991121eaf0a4a35b78aa7f088ec2c (patch) | |
| tree | 3edac7eaccd745ebc33fdd4080ee9a22ab9c3cab | |
| parent | 6864abd8b730435d6ae9cb061095229a5a85153f (diff) | |
[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>
| -rw-r--r-- | MAINTAINERS | 10 | ||||
| -rw-r--r-- | drivers/scsi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/scsi/Makefile | 2 |
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 |