diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-09-13 13:38:42 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-09-13 13:38:42 -0400 |
| commit | b05f01b32d39f960407c2fbc56244d14b9ff19a5 (patch) | |
| tree | acd42e1b88857758187de2a50e4b9767cb4a8224 /drivers/macintosh/windfarm_rm31.c | |
| parent | 70c67d3efde6ef4fa2fae0ba7fac3aaf011a1385 (diff) | |
| parent | 8514c7d8607cd8b6da39187d12fd00e874fa8388 (diff) | |
Merge tag 'v3.6.11.9' into v3.6-rt
Conflicts:
arch/arm/kernel/process.c
kernel/hrtimer.c
Diffstat (limited to 'drivers/macintosh/windfarm_rm31.c')
| -rw-r--r-- | drivers/macintosh/windfarm_rm31.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/macintosh/windfarm_rm31.c b/drivers/macintosh/windfarm_rm31.c index 3eca6d4b52fc..e13d9fd9737d 100644 --- a/drivers/macintosh/windfarm_rm31.c +++ b/drivers/macintosh/windfarm_rm31.c @@ -439,15 +439,15 @@ static void backside_setup_pid(void) /* Slots fan */ static const struct wf_pid_param slots_param = { - .interval = 5, - .history_len = 2, - .gd = 30 << 20, - .gp = 5 << 20, - .gr = 0, - .itarget = 40 << 16, - .additive = 1, - .min = 300, - .max = 4000, + .interval = 1, + .history_len = 20, + .gd = 0, + .gp = 0, + .gr = 0x00100000, + .itarget = 3200000, + .additive = 0, + .min = 20, + .max = 100, }; static void slots_fan_tick(void) |