diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-26 21:05:54 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-26 21:05:54 +0200 |
| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch) | |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 /drivers/thermal/samsung/Makefile | |
| parent | clocksource: vf_pit_timer: Switch to sched_clock_register() (diff) | |
| parent | Merge branch 'fortglx/3.12/time' into fortglx/3.13/time (diff) | |
| download | linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.tar.xz linux-17deb9c2db01c7813611291d251d8c7dbdfd3c9d.zip | |
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion
Update to tip/timers/core and resolve minor conflict.
Conflicts:
drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/thermal/samsung/Makefile')
| -rw-r--r-- | drivers/thermal/samsung/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/thermal/samsung/Makefile b/drivers/thermal/samsung/Makefile new file mode 100644 index 000000000000..c09d83095dc2 --- /dev/null +++ b/drivers/thermal/samsung/Makefile @@ -0,0 +1,7 @@ +# +# Samsung thermal specific Makefile +# +obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o +exynos_thermal-y := exynos_tmu.o +exynos_thermal-y += exynos_tmu_data.o +exynos_thermal-$(CONFIG_EXYNOS_THERMAL_CORE) += exynos_thermal_common.o |