diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 398f9221f3..d4c53c68a4 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -1949,7 +1949,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=y
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index 4e00a8b28f..291e1b1cea 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1909,7 +1909,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=y
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index 49f63c9b00..6e3a0cfb09 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -1947,7 +1947,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=y
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 99bad8ac4e..5690fb75dd 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -1831,7 +1831,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=y
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index 04427abed1..5c2b1e8719 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -1949,7 +1949,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=y
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index 4f73a74636..6c46f076d7 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -1909,7 +1909,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=y
+CONFIG_INTEL_POWERCLAMP=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y