diff --git a/config-armv7-generic b/config-armv7-generic
index 77889b979..48dac0ca1 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -122,7 +122,7 @@ CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARM_PSCI=y
 CONFIG_THERMAL=y
 CONFIG_CLOCK_THERMAL=y
-CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT=m
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
@@ -224,13 +224,13 @@ CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5800=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_ARM_EXYNOS_CPUFREQ=m
 CONFIG_ARM_EXYNOS5250_CPUFREQ=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
 # CONFIG_ARM_EXYNOS_CPUIDLE is not set
 CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
 # CONFIG_EXYNOS5420_MCPM not set
-CONFIG_ARM_EXYNOS_CPUFREQ=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 
 CONFIG_I2C_EXYNOS5=m
diff --git a/kernel.spec b/kernel.spec
index 056fadf53..12bf470e5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2222,6 +2222,9 @@ fi
 #
 # 
 %changelog
+* Tue Jun 16 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Make some of the ARMv7 cpufreq drivers modular
+
 * Mon Jun 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc8.git0.1
 - Linux v4.1-rc8