diff --git a/debian/changelog b/debian/changelog
index b9e4f98aa..e950a2c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 linux (4.1.2-1~exp2) UNRELEASED; urgency=medium
 
+  [ Ben Hutchings ]
   * [armel/kirkwood] ubi: Change UBIFS_FS and MTD_UBI from built-in to
     modules, to reduce kernel image size (fixes FTBFS)
 
+  [ Ian Campbell ]
+  * [armhf] Set CONFIG_ARM_TEGRA_CPUFREQ as builtin.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 15 Jul 2015 15:16:42 +0100
 
 linux (4.1.2-1~exp1) experimental; urgency=medium
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 3143d5837..9dc4c564d 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -174,7 +174,7 @@ CONFIG_CPUFREQ_DT=m
 ## file: drivers/cpufreq/Kconfig.arm
 ##
 CONFIG_ARM_IMX6Q_CPUFREQ=m
-CONFIG_ARM_TEGRA_CPUFREQ=m
+CONFIG_ARM_TEGRA_CPUFREQ=y
 
 ##
 ## file: drivers/crypto/Kconfig