linux-next: manual merge of the thermal tree with the pm tree

Stephen Rothwell
2014-01-06T03:14:29Z

[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]

Hi Zhang,

Today's linux-next merge of the thermal tree got a conflict in
drivers/cpufreq/Kconfig between commit 109df086e002 ("cpufreq: Select
PM_OPP rather than depending on it") from the pm tree and commit
77cff5926a14 ("cpufreq: cpufreq-cpu0: add dt node parsing for cooling
device properties") from the thermal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/cpufreq/Kconfig
index 386dbc9ccdfd,6b8cde5f98af..000000000000
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@@ -181,8 -181,7 +181,8 @@@ config CPU_FREQ_GOV_CONSERVATIV

config GENERIC_CPUFREQ_CPU0
tristate "Generic CPU0 cpufreq driver"
- depends on HAVE_CLK && REGULATOR && OF
- depends on HAVE_CLK && REGULATOR && PM_OPP && OF && THERMAL && CPU_THERMAL
++ depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
+ select PM_OPP
help
This adds a generic cpufreq driver for CPU0 frequency management.
It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]