summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2018-04-20 00:07:42 +0200
committerDan Williams <dan.j.williams@intel.com>2018-04-20 00:10:56 +0200
commitf22acf82746dd3d75e06d7c5801926d3b9c50169 (patch)
treeed87cd8d6767f67d6224ceedf7bd51bfacb27446
parentlibnvdimm, of_pmem: use dev_to_node() instead of of_node_to_nid() (diff)
downloadlinux-f22acf82746dd3d75e06d7c5801926d3b9c50169.tar.xz
linux-f22acf82746dd3d75e06d7c5801926d3b9c50169.zip
Revert "libnvdimm, of_pmem: workaround OF_NUMA=n build error"
With commit df3f126482db ("libnvdimm, of_pmem: use dev_to_node() instead of of_node_to_nid()") it is now possible to allow of_pmem to be built as a module as originally implemented. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/nvdimm/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index 85997184e047..9d36473dc2a2 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -103,8 +103,7 @@ 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"
+ tristate "Device-tree support for persistent memory regions"
depends on OF
default LIBNVDIMM
help