[arm] thermal: Re-enable CPU_THERMAL as built-in (regression in 3.10~rc4-1~exp1)

svn path=/dists/trunk/linux/; revision=20634
This commit is contained in:
Ben Hutchings 2013-09-15 17:21:54 +00:00
parent 4604380f0b
commit 5797cdb437
3 changed files with 4 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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 <ben@decadent.org.uk> Fri, 13 Sep 2013 04:37:21 +0100

View File

@ -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

View File

@ -27,5 +27,5 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
## file: drivers/thermal/Kconfig
##
CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=m
CONFIG_CPU_THERMAL=y