summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/Kconfig
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2018-04-09 19:50:08 +0200
committerDan Williams <dan.j.williams@intel.com>2018-04-09 19:50:08 +0200
commit1ed41b5696ccc3ff40a1dee39fe14eff273faf82 (patch)
tree1202df08129d350a65cf220406eb7ce87185d813 /drivers/nvdimm/Kconfig
parentLinux 4.16-rc7 (diff)
parentlibnvdimm, of_pmem: workaround OF_NUMA=n build error (diff)
downloadlinux-1ed41b5696ccc3ff40a1dee39fe14eff273faf82.tar.xz
linux-1ed41b5696ccc3ff40a1dee39fe14eff273faf82.zip
Merge branch 'for-4.17/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/Kconfig')
-rw-r--r--drivers/nvdimm/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index a65f2e1d9f53..f6c533c4d09b 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -102,4 +102,15 @@ config NVDIMM_DAX
Select Y if unsure
+config OF_PMEM
+ # FIXME: make tristate once OF_NUMA dependency removed
+ bool "Device-tree support for persistent memory regions"
+ depends on OF
+ default LIBNVDIMM
+ help
+ Allows regions of persistent memory to be described in the
+ device-tree.
+
+ Select Y if unsure.
+
endif