summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index dd42a8fdd..8d8b27519 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -216,7 +216,8 @@ CONFIG_CMA=y
CONFIG_CMA_AREAS=7
# Changes for persistent memory devices
-# CONFIG_ZONE_DMA is not set
+# ZONE_DMA and ZONE_DEVICE can now co-exist
+CONFIG_ZONE_DMA=y
CONFIG_ZONE_DEVICE=y
CONFIG_NVDIMM_PFN=y
CONFIG_ND_PFN=m