From 5797cdb437dd48d72822ec30c3d26d457f3fdaf4 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 15 Sep 2013 17:21:54 +0000 Subject: [PATCH] [arm] thermal: Re-enable CPU_THERMAL as built-in (regression in 3.10~rc4-1~exp1) svn path=/dists/trunk/linux/; revision=20634 --- debian/changelog | 2 ++ debian/config/armel/config | 2 +- debian/config/armhf/config | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a74e678d8..b7ec88e1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ linux (3.11.1-1~exp1) UNRELEASED; urgency=low * [armhf/mx5] Fix configuration regressions in 3.11-1~exp1: - mmc: Re-enable MMC_SDHCI_PLTFM as module - regulator: Re-enable REGULATOR as built-in + * [arm] thermal: Re-enable CPU_THERMAL as built-in (regression in + 3.10~rc4-1~exp1) -- Ben Hutchings Fri, 13 Sep 2013 04:37:21 +0100 diff --git a/debian/config/armel/config b/debian/config/armel/config index b4debe9f2..d8833e15f 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -108,7 +108,7 @@ CONFIG_YAM=m ## file: drivers/thermal/Kconfig ## CONFIG_THERMAL=y -CONFIG_CPU_THERMAL=m +CONFIG_CPU_THERMAL=y ## ## file: drivers/tty/serial/8250/Kconfig diff --git a/debian/config/armhf/config b/debian/config/armhf/config index ae1436c47..27d9bcb99 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -27,5 +27,5 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y ## file: drivers/thermal/Kconfig ## CONFIG_THERMAL=y -CONFIG_CPU_THERMAL=m +CONFIG_CPU_THERMAL=y