diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
commit | 590e935df0c94b2d7a4584bb26906666176a6133 (patch) | |
tree | bb004c31d277423c7eb0f6bd2c0c1e9d8428e9f2 /drivers/thermal/db8500_cpufreq_cooling.c | |
parent | 774b195c03ac44c0dbc4e81a3f194779692ce3bd (diff) | |
parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-16.01-rtlsk-v3.18-15.12-rtlsk-v3.18-15.11-rtlsk-v3.18-15.10-rtlsk-v3.18-15.09-rtlsk-v3.18-15.08-rtlsk-v3.18-15.07-rt
Diffstat (limited to 'drivers/thermal/db8500_cpufreq_cooling.c')
-rw-r--r-- | drivers/thermal/db8500_cpufreq_cooling.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c index 786d19263ab0..1ac7ec651c3f 100644 --- a/drivers/thermal/db8500_cpufreq_cooling.c +++ b/drivers/thermal/db8500_cpufreq_cooling.c @@ -18,7 +18,6 @@ */ #include <linux/cpu_cooling.h> -#include <linux/cpufreq.h> #include <linux/err.h> #include <linux/module.h> #include <linux/of.h> @@ -30,10 +29,6 @@ static int db8500_cpufreq_cooling_probe(struct platform_device *pdev) struct thermal_cooling_device *cdev; struct cpumask mask_val; - /* make sure cpufreq driver has been initialized */ - if (!cpufreq_frequency_get_table(0)) - return -EPROBE_DEFER; - cpumask_set_cpu(0, &mask_val); cdev = cpufreq_cooling_register(&mask_val); |