From e67e4ad4b161bd60b9da4c1872a9d77e0cac95fa Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baumann@progress-linux.org> Date: Mon, 5 Aug 2024 21:21:13 +0200 Subject: Merging upstream version 6.9.7. Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org> --- drivers/nvdimm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/nvdimm/Kconfig') diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index 77b06d54cc..fde3e17c83 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -24,7 +24,7 @@ config BLK_DEV_PMEM select ND_PFN if NVDIMM_PFN help Memory ranges for PMEM are described by either an NFIT - (NVDIMM Firmware Interface Table, see CONFIG_NFIT_ACPI), a + (NVDIMM Firmware Interface Table, see CONFIG_ACPI_NFIT), a non-standard OEM-specific E820 memory type (type-12, see CONFIG_X86_PMEM_LEGACY), or it is manually specified by the 'memmap=nn[KMG]!ss[KMG]' kernel command line (see -- cgit v1.2.3