Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ab3e37a..519b6d3 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -180,14 +180,6 @@ config BLK_DEV_LOOP
          bits of, say, a sound file). This is also safe if the file resides
          on a remote file server.
 
-         There are several ways of encrypting disks. Some of these require
-         kernel patches. The vanilla kernel offers the cryptoloop option
-         and a Device Mapper target (which is superior, as it supports all
-         file systems). If you want to use the cryptoloop, say Y to both
-         LOOP and CRYPTOLOOP, and make sure you have a recent (version 2.12
-         or later) version of util-linux. Additionally, be aware that
-         the cryptoloop is not safe for storing journaled filesystems.
-
          Note that this loop device has nothing to do with the loopback
          device used for network connections from the machine to itself.
 
@@ -211,21 +203,6 @@ config BLK_DEV_LOOP_MIN_COUNT
          is used, it can be set to 0, since needed loop devices can be
          dynamically allocated with the /dev/loop-control interface.
 
-config BLK_DEV_CRYPTOLOOP
-       tristate "Cryptoloop Support (DEPRECATED)"
-       select CRYPTO
-       select CRYPTO_CBC
-       depends on BLK_DEV_LOOP
-       help
-         Say Y here if you want to be able to use the ciphers that are 
-         provided by the CryptoAPI as loop transformation. This might be
-         used as hard disk encryption.
-
-         WARNING: This device is not safe for journaled file systems like
-         ext3 or Reiserfs. Please use the Device Mapper crypto module
-         instead, which can be configured to be on-disk compatible with the
-         cryptoloop device.  cryptoloop support will be removed in Linux 5.16.
-
 source "drivers/block/drbd/Kconfig"
 
 config BLK_DEV_NBD
@@ -304,8 +281,8 @@ config BLK_DEV_RAM_SIZE
 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media (DEPRECATED)"
        depends on !UML
+       depends on SCSI
        select CDROM
-       select SCSI_COMMON
        help
          Note: This driver is deprecated and will be removed from the
          kernel in the near future!
@@ -394,6 +371,7 @@ config XEN_BLKDEV_BACKEND
 config VIRTIO_BLK
        tristate "Virtio block driver"
        depends on VIRTIO
+       select SG_POOL
        help
          This is the virtual block driver for virtio.  It can be used with
           QEMU based VMMs (like KVM or Xen).  Say Y or M.
@@ -414,17 +392,6 @@ config BLK_DEV_RBD
 
          If unsure, say N.
 
-config BLK_DEV_RSXX
-       tristate "IBM Flash Adapter 900GB Full Height PCIe Device Driver"
-       depends on PCI
-       select CRC32
-       help
-         Device driver for IBM's high speed PCIe SSD
-         storage device: Flash Adapter 900GB Full Height.
-
-         To compile this driver as a module, choose M here: the
-         module will be called rsxx.
-
 source "drivers/block/rnbd/Kconfig"
 
 endif # BLK_DEV