diff options
| -rw-r--r-- | Documentation/driver-api/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/driver-api/nvdimm/btt.rst (renamed from Documentation/nvdimm/btt.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/nvdimm/index.rst (renamed from Documentation/nvdimm/index.rst) | 2 | ||||
| -rw-r--r-- | Documentation/driver-api/nvdimm/nvdimm.rst (renamed from Documentation/nvdimm/nvdimm.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/nvdimm/security.rst (renamed from Documentation/nvdimm/security.rst) | 0 | ||||
| -rw-r--r-- | drivers/nvdimm/Kconfig | 2 |
6 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst index d665cd9ab95f..410dd7110772 100644 --- a/Documentation/driver-api/index.rst +++ b/Documentation/driver-api/index.rst @@ -44,6 +44,7 @@ available subsections can be seen below. mtdnand miscellaneous mei/index + nvdimm/index w1 rapidio/index s390-drivers diff --git a/Documentation/nvdimm/btt.rst b/Documentation/driver-api/nvdimm/btt.rst index 2d8269f834bd..2d8269f834bd 100644 --- a/Documentation/nvdimm/btt.rst +++ b/Documentation/driver-api/nvdimm/btt.rst diff --git a/Documentation/nvdimm/index.rst b/Documentation/driver-api/nvdimm/index.rst index 1a3402d3775e..19dc8ee371dc 100644 --- a/Documentation/nvdimm/index.rst +++ b/Documentation/driver-api/nvdimm/index.rst @@ -1,5 +1,3 @@ -:orphan: - =================================== Non-Volatile Memory Device (NVDIMM) =================================== diff --git a/Documentation/nvdimm/nvdimm.rst b/Documentation/driver-api/nvdimm/nvdimm.rst index 08f855cbb4e6..08f855cbb4e6 100644 --- a/Documentation/nvdimm/nvdimm.rst +++ b/Documentation/driver-api/nvdimm/nvdimm.rst diff --git a/Documentation/nvdimm/security.rst b/Documentation/driver-api/nvdimm/security.rst index ad9dea099b34..ad9dea099b34 100644 --- a/Documentation/nvdimm/security.rst +++ b/Documentation/driver-api/nvdimm/security.rst diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index e89c1c332407..a5fde15e91d3 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -33,7 +33,7 @@ config BLK_DEV_PMEM Documentation/admin-guide/kernel-parameters.rst). This driver converts these persistent memory ranges into block devices that are capable of DAX (direct-access) file system mappings. See - Documentation/nvdimm/nvdimm.rst for more details. + Documentation/driver-api/nvdimm/nvdimm.rst for more details. Say Y if you want to use an NVDIMM |