summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-10-07 16:46:30 -0700
committerDan Williams <dan.j.williams@intel.com>2016-10-07 16:46:30 -0700
commite476f94482fc20a23b7b33b3d8e50f1953f71828 (patch)
tree8ac0e5812ea683b348bb70ba8c0d513e2a8f5739 /drivers/nvdimm
parent178d6f4be8bf42b298bedf8ea2a00754100e0c4e (diff)
parent4e65e9381c7ac211ec2133e473fcbdd8656c779a (diff)
downloadlinux-e476f94482fc20a23b7b33b3d8e50f1953f71828.tar.bz2
Merge branch 'for-4.9/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index 124c2432ac9c..8b2b740d6679 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -89,7 +89,7 @@ config NVDIMM_PFN
Select Y if unsure
config NVDIMM_DAX
- bool "NVDIMM DAX: Raw access to persistent memory"
+ tristate "NVDIMM DAX: Raw access to persistent memory"
default LIBNVDIMM
depends on NVDIMM_PFN
help