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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/thermal/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 31e232f84b6b..b7e65423d7b6 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -11,6 +11,7 @@ thermal_sys-$(CONFIG_THERMAL_OF) += of-thermal.o # governors thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o +thermal_sys-$(CONFIG_THERMAL_GOV_BANG_BANG) += gov_bang_bang.o thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o |