diff --git a/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM b/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM
index f773300dc..aeaaefec7 100644
--- a/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM
+++ b/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM
@@ -1 +1 @@
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_LIBNVDIMM b/configs/fedora/generic/x86/x86_64/CONFIG_LIBNVDIMM
index f773300dc..aeaaefec7 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_LIBNVDIMM
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_LIBNVDIMM
@@ -1 +1 @@
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index d0be922a6..21c7979d1 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2571,7 +2571,7 @@ CONFIG_LIBERTAS_USB=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
 CONFIG_LIQUIDIO_VF=m
 CONFIG_LIRC=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 261f3d3f7..6929cebb0 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2552,7 +2552,7 @@ CONFIG_LIBERTAS_USB=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
 CONFIG_LIQUIDIO_VF=m
 CONFIG_LIRC=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 86fe169db..f6352079c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2871,7 +2871,7 @@ CONFIG_LIBERTAS_USB=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
 CONFIG_LIQUIDIO_VF=m
 CONFIG_LIRC=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 965cfe5fb..fad3cde3f 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2852,7 +2852,7 @@ CONFIG_LIBERTAS_USB=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LIBNVDIMM=y
+CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
 CONFIG_LIQUIDIO_VF=m
 CONFIG_LIRC=y