Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[karo-tx-linux.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 1b8094d4d7af70f38e38bd9d3f5736a55f31dd82..3ccef9eba6f9dc53cecb785c23582cbdeb3b8618 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -404,6 +404,18 @@ 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