Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index bb72ada9f074..1d886e079c58 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -298,6 +298,22 @@ config BLK_DEV_NBD
 
           If unsure, say N.
 
+config BLK_DEV_OSD
+        tristate "OSD object-as-blkdev support"
+        depends on SCSI_OSD_ULD
+        ---help---
+          Saying Y or M here will allow the exporting of a single SCSI
+          OSD (object-based storage) object as a Linux block device.
+
+          For example, if you create a 2G object on an OSD device,
+          you can then use this module to present that 2G object as
+          a Linux block device.
+
+          To compile this driver as a module, choose M here: the
+          module will be called osdblk.
+
+          If unsure, say N.
+
 config BLK_DEV_SX8
         tristate "Promise SATA SX8 support"
         depends on PCI