diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2018-12-07 09:49:50 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2018-12-07 09:49:50 +0100 |
| commit | eaaa598c0a285ef3b0efa54e711a385269fe50ce (patch) | |
| tree | 6e33bb0f35d84eae9fc0cc8b88dae1570231eafe /drivers/thermal/qcom/Makefile | |
| parent | thermal: Fix locking in cooling device sysfs update cur_state (diff) | |
| parent | drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir (diff) | |
| download | linux-eaaa598c0a285ef3b0efa54e711a385269fe50ce.tar.xz linux-eaaa598c0a285ef3b0efa54e711a385269fe50ce.zip | |
Merge branches 'for-rc' and 'thermal-core' into next
Diffstat (limited to 'drivers/thermal/qcom/Makefile')
| -rw-r--r-- | drivers/thermal/qcom/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile index a821929ede0b..717a08600bb5 100644 --- a/drivers/thermal/qcom/Makefile +++ b/drivers/thermal/qcom/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o +obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o |