diff --git a/[refs] b/[refs] index 6af011361bf0..7bf7cabdebbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b9e35265903c2e0e484dc224e8f7de506e3353f +refs/heads/master: d8892a01b13c8ea3ad74fb0c56beb96e92a2c65e diff --git a/trunk/drivers/thermal/cpu_cooling.c b/trunk/drivers/thermal/cpu_cooling.c index 2d94ffa3230d..34d807bc5c3f 100644 --- a/trunk/drivers/thermal/cpu_cooling.c +++ b/trunk/drivers/thermal/cpu_cooling.c @@ -141,7 +141,8 @@ enum cpufreq_cooling_property { * Return: 0 on success, -EINVAL when invalid parameters are passed. */ static int get_property(unsigned int cpu, unsigned long input, - unsigned int* output, enum cpufreq_cooling_property property) + unsigned int *output, + enum cpufreq_cooling_property property) { int i, j; unsigned long max_level = 0, level = 0;