summaryrefslogtreecommitdiffstats
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-23 22:01:51 +0200
committerJens Axboe <axboe@kernel.dk>2012-10-23 22:30:38 +0200
commitb8977285ecb0033b0bd9a99d4355f9c0bc8708f1 (patch)
tree0359755875c12a588755636abf858ecb8dfbd1c5 /drivers/block/Kconfig
parentblock: remove CONFIG_EXPERIMENTAL (diff)
downloadlinux-b8977285ecb0033b0bd9a99d4355f9c0bc8708f1.tar.xz
linux-b8977285ecb0033b0bd9a99d4355f9c0bc8708f1.zip
drivers/block: remove CONFIG_EXPERIMENTAL
This config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it. CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: Asai Thambi S P <asamymuthupa@micron.com> CC: Pete Zaitcev <zaitcev@redhat.com> CC: Cong Wang <xiyou.wangcong@gmail.com> CC: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index f529407db93f..6983a65c8df3 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -166,8 +166,8 @@ config BLK_DEV_DAC960
module will be called DAC960.
config BLK_DEV_UMEM
- tristate "Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
+ tristate "Micro Memory MM5415 Battery Backed RAM support"
+ depends on PCI
---help---
Saying Y here will include support for the MM5415 family of
battery backed (Non-volatile) RAM cards.
@@ -430,8 +430,8 @@ config CDROM_PKTCDVD_BUFFERS
a disc is opened for writing.
config CDROM_PKTCDVD_WCACHE
- bool "Enable write caching (EXPERIMENTAL)"
- depends on CDROM_PKTCDVD && EXPERIMENTAL
+ bool "Enable write caching"
+ depends on CDROM_PKTCDVD
help
If enabled, write caching will be set for the CD-R/W device. For now
this option is dangerous unless the CD-RW media is known good, as we
@@ -508,8 +508,8 @@ config XEN_BLKDEV_BACKEND
config VIRTIO_BLK
- tristate "Virtio block driver (EXPERIMENTAL)"
- depends on EXPERIMENTAL && VIRTIO
+ tristate "Virtio block driver"
+ depends on 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.
@@ -528,7 +528,7 @@ config BLK_DEV_HD
config BLK_DEV_RBD
tristate "Rados block device (RBD)"
- depends on INET && EXPERIMENTAL && BLOCK
+ depends on INET && BLOCK
select CEPH_LIB
select LIBCRC32C
select CRYPTO_AES