Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4245b7f80a49de11d2709ffd66a23f7d371137a3..4d0119ea9e351ce1a4d302b810fe3b709b3c713c 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -204,23 +204,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 +334,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 +344,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 +425,10 @@ 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 lguest.  Say Y or M.
+

 endif # BLK_DEV
 endif # BLK_DEV