cciss: fix scatter gather chain block dma direction kludge

[safe/jmp/linux-2.6] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ac5e05a..77bfce5 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -112,7 +112,7 @@ config GDROM
          with up to 1 GB of data. This drive will also read standard CD ROM
          disks. Select this option to access any disks in your GD ROM drive.
          Most users will want to say "Y" here.
-         You can also build this as a module which will be called gdrom.ko
+         You can also build this as a module which will be called gdrom.
 
 source "drivers/block/paride/Kconfig"
 
@@ -271,6 +271,8 @@ config BLK_DEV_CRYPTOLOOP
          instead, which can be configured to be on-disk compatible with the
          cryptoloop device.
 
+source "drivers/block/drbd/Kconfig"
+
 config BLK_DEV_NBD
        tristate "Network block device support"
        depends on NET
@@ -298,6 +300,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