diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-09-18 10:48:40 +0400 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-09-18 10:48:40 +0400 |
| commit | dd634666793e51b43b703161302310326c259d50 (patch) | |
| tree | 2da0cbb2db8176c4d5f7ef160f681ff6ed696aa1 /drivers/thermal/thermal_core.c | |
| parent | 62ebb7b16699996a8f8ad277ce6a36ef3c9114a3 (diff) | |
| parent | e4dbf98f7f169346f57296e173e883b7330076ab (diff) | |
| download | linux-dd634666793e51b43b703161302310326c259d50.tar.xz | |
Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into next
Diffstat (limited to 'drivers/thermal/thermal_core.c')
| -rw-r--r-- | drivers/thermal/thermal_core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 454884aa15f7..976b8aee1da4 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1797,6 +1797,10 @@ static int __init thermal_register_governors(void) if (result) return result; + result = thermal_gov_bang_bang_register(); + if (result) + return result; + return thermal_gov_user_space_register(); } @@ -1804,6 +1808,7 @@ static void thermal_unregister_governors(void) { thermal_gov_step_wise_unregister(); thermal_gov_fair_share_unregister(); + thermal_gov_bang_bang_unregister(); thermal_gov_user_space_unregister(); } |