From e1c3f3303841250ae80a8e2718b242cb7f8628e5 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Sun, 25 Jan 2009 17:24:14 +0200 Subject: [PATCH] --- yaml --- r: 136251 b: refs/heads/master c: 68274794c69991121eaf0a4a35b78aa7f088ec2c h: refs/heads/master i: 136249: 4ecb1ea7f8e0a5564dcb9ffde3dfd1dbdbe8f0ea 136247: 4e5bc43f999d81d3ca6599c85678017005b60499 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 10 ++++++++++ trunk/drivers/scsi/Kconfig | 2 ++ trunk/drivers/scsi/Makefile | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b452234a0698..1d27efa2cfc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6864abd8b730435d6ae9cb061095229a5a85153f +refs/heads/master: 68274794c69991121eaf0a4a35b78aa7f088ec2c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1c2ca1dc66f2..e26fb02ac759 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index 601c2a8ec242..e420ad0acebf 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/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/trunk/drivers/scsi/Makefile b/trunk/drivers/scsi/Makefile index 7461eb09a031..05558b170419 100644 --- a/trunk/drivers/scsi/Makefile +++ b/trunk/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