Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4245b7f80a49de11d2709ffd66a23f7d371137a3..64e5148d82bc8cce2018012f6bf5587570ba2267 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -105,6 +105,17 @@ config PARIDE
          "MicroSolutions backpack protocol", "DataStor Commuter protocol"
          etc.).
 
          "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.ko
+

 source "drivers/block/paride/Kconfig"
 
 config BLK_CPQ_DA
 source "drivers/block/paride/Kconfig"
 
 config BLK_CPQ_DA


@@ -204,23 +215,6 @@ config BLK_DEV_COW_COMMON
        bool
        default BLK_DEV_UBD
 
        bool
        default BLK_DEV_UBD
 

-config MMAPPER
-       tristate "Example IO memory driver (BROKEN)"
-       depends on UML && BROKEN
-       ---help---
-          The User-Mode Linux port can provide support for IO Memory
-          emulation with this option.  This allows a host file to be
-          specified as an I/O region on the kernel command line. That file
-          will be mapped into UML's kernel address space where a driver can
-          locate it and do whatever it wants with the memory, including
-          providing an interface to it for UML processes to use.
-
-          For more information, see
-          <http://user-mode-linux.sourceforge.net/iomem.html>.
-
-          If you'd like to be able to provide a simulated IO port space for
-          User-Mode Linux processes, say Y.  If unsure, say N.
-

 config BLK_DEV_LOOP
        tristate "Loopback device support"
        ---help---
 config BLK_DEV_LOOP
        tristate "Loopback device support"
        ---help---


@@ -351,7 +345,7 @@ config BLK_DEV_RAM_COUNT
        default "16"
        depends on BLK_DEV_RAM
        help
        default "16"
        depends on BLK_DEV_RAM
        help

-         The default value is 16 RAM disks. Change this if you know what
+         The default value is 16 RAM disks. Change this if you know what you

          are doing. If you boot from a filesystem that needs to be extracted
          in memory, you will need at least one RAM disk (e.g. root on cramfs).
 
          are doing. If you boot from a filesystem that needs to be extracted
          in memory, you will need at least one RAM disk (e.g. root on cramfs).
 


@@ -361,8 +355,7 @@ config BLK_DEV_RAM_SIZE
        default "4096"
        help
          The default value is 4096 kilobytes. Only change this if you know
        default "4096"
        help
          The default value is 4096 kilobytes. Only change this if you know

-         what are you doing. If you are using IBM S/390, then set this to
-         8192.
+         what you are doing.

 
 config BLK_DEV_RAM_BLOCKSIZE
        int "Default RAM disk block size (bytes)"
 
 config BLK_DEV_RAM_BLOCKSIZE
        int "Default RAM disk block size (bytes)"


@@ -443,4 +436,11 @@ config XEN_BLKDEV_FRONTEND
          block device driver.  It communicates with a back-end driver
          in another domain which drives the actual block device.
 
          block device driver.  It communicates with a back-end driver
          in another domain which drives the actual block device.
 

+config VIRTIO_BLK
+       tristate "Virtio block driver (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && VIRTIO
+       ---help---
+         This is the virtual block driver for virtio.  It can be used with
+          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
+

 endif # BLK_DEV
 endif # BLK_DEV