diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
| commit | 917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) | |
| tree | b5932aab90d449841803b6f8679a4564ca2a6eaf /drivers/nvdimm/Kconfig | |
| parent | kernel-doc: add support for one line inline struct member doc comments (diff) | |
| parent | Linux 4.9-rc4 (diff) | |
| download | linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.xz linux-917fef6f7ee8b2fe852692ac49771342bfef9433.zip | |
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
Diffstat (limited to 'drivers/nvdimm/Kconfig')
| -rw-r--r-- | drivers/nvdimm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index b20ce7da1ee4..59e750183b7f 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -89,7 +89,7 @@ config NVDIMM_PFN Select Y if unsure config NVDIMM_DAX - tristate "NVDIMM DAX: Raw access to persistent memory" + bool "NVDIMM DAX: Raw access to persistent memory" default LIBNVDIMM depends on NVDIMM_PFN help |