Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 1b98cc5..de27768 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -76,6 +76,17 @@ config BLK_DEV_XD
 
          It's pretty unlikely that you have one of these: say N.
 
+config GDROM
+       tristate "SEGA Dreamcast GD-ROM drive"
+       depends on SH_DREAMCAST
+       help
+         A standard SEGA Dreamcast comes with a modified CD ROM drive called a
+         "GD-ROM" by SEGA to signify it is capable of reading special disks
+         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.
+
 config PARIDE
        tristate "Parallel port IDE device support"
        depends on PARPORT_PC
@@ -103,17 +114,6 @@ config PARIDE
          "MicroSolutions backpack protocol", "DataStor Commuter protocol"
          etc.).
 
-config GDROM
-       tristate "SEGA Dreamcast GD-ROM drive"
-       depends on SH_DREAMCAST
-       help
-         A standard SEGA Dreamcast comes with a modified CD ROM drive called a
-         "GD-ROM" by SEGA to signify it is capable of reading special disks
-         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.
-
 source "drivers/block/paride/Kconfig"
 
 config BLK_CPQ_DA
@@ -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
@@ -438,7 +456,7 @@ source "drivers/s390/block/Kconfig"
 
 config XILINX_SYSACE
        tristate "Xilinx SystemACE support"
-       depends on 4xx
+       depends on 4xx || MICROBLAZE
        help
          Include support for the Xilinx SystemACE CompactFlash interface