diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-03-26 09:38:29 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-14 17:28:43 +0200 |
| commit | 80a26a5c22b90a82b8696cb72c1d09d525ada53e (patch) | |
| tree | 4ab06fb87e9e3e6364ad234b0594f6ac40227cdc /drivers/thermal/Makefile | |
| parent | Thermal: rename thermal_sys.c to thermal_core.c (diff) | |
| download | linux-80a26a5c22b90a82b8696cb72c1d09d525ada53e.tar.xz linux-80a26a5c22b90a82b8696cb72c1d09d525ada53e.zip | |
Thermal: build thermal governors into thermal_sys module
The thermal governors are part of the thermal framework,
rather than a seperate feature/module.
Because the generic thermal layer can not work without
thermal governors, and it must load the thermal governors
during its initialization.
Build them into one module in this patch.
This also fix a problem that the generic thermal layer does not
work when CONFIG_THERMAL=m and CONFIG_THERMAL_GOV_XXX=y.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>
Diffstat (limited to 'drivers/thermal/Makefile')
| -rw-r--r-- | drivers/thermal/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 1bf2eab50b27..b17bfb055498 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -6,9 +6,9 @@ obj-$(CONFIG_THERMAL) += thermal_sys.o thermal_sys-y += thermal_core.o # governors -obj-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o -obj-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o -obj-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o +thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += fair_share.o +thermal_sys-$(CONFIG_THERMAL_GOV_STEP_WISE) += step_wise.o +thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o # cpufreq cooling obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o |