These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / block / Kconfig

diff --git a/kernel/drivers/block/Kconfig b/kernel/drivers/block/Kconfig
index 3ccef9e..29819e7 100644 (file)
--- a/kernel/drivers/block/Kconfig
+++ b/kernel/drivers/block/Kconfig
@@ -310,17 +310,6 @@ config BLK_DEV_NBD
 
          If unsure, say N.
 
-config BLK_DEV_NVME
-       tristate "NVM Express block device"
-       depends on PCI
-       ---help---
-         The NVM Express driver is for solid state drives directly
-         connected to the PCI or PCI Express bus.  If you know you
-         don't have one of these, it is safe to answer N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called nvme.
-
 config BLK_DEV_SKD
        tristate "STEC S1120 Block Driver"
        depends on PCI
@@ -404,18 +393,6 @@ config BLK_DEV_RAM_DAX
          and will prevent RAM block device backing store memory from being
          allocated from highmem (only a problem for highmem systems).
 
-config BLK_DEV_PMEM
-       tristate "Persistent memory block device support"
-       depends on HAS_IOMEM
-       help
-         Saying Y here will allow you to use a contiguous range of reserved
-         memory as one or more persistent block devices.
-
-         To compile this driver as a module, choose M here: the module will be
-         called 'pmem'.
-
-         If unsure, say N.
-
 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"
        depends on !UML