diff options
| author | Fabio Estevam <festevam@gmail.com> | 2018-02-26 21:54:02 -0300 |
|---|---|---|
| committer | Fabio Estevam <festevam@gmail.com> | 2018-02-26 21:54:02 -0300 |
| commit | 20ebb9fb81ecf84b57197aaa2a44be017d48e597 (patch) | |
| tree | 54f6e35248e45254412291842083ddde9e400867 /drivers/thermal | |
| parent | 3c939d6f1d4c5c70b26d23cbd2e3d3e67e2bca69 (diff) | |
| parent | 19c04ca5b239e6e2277a5b381d1e79482ab9bbc5 (diff) | |
Merge tag 'v4.9.84' into 4.9-1.0.x-imx-stable-merge
This is the 4.9.84 stable release
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index d5ede3e38d70..9e35c5161a02 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -323,7 +323,7 @@ config X86_PKG_TEMP_THERMAL config INTEL_SOC_DTS_IOSF_CORE tristate - depends on X86 + depends on X86 && PCI select IOSF_MBI help This is becoming a common feature for Intel SoCs to expose the additional @@ -333,7 +333,7 @@ config INTEL_SOC_DTS_IOSF_CORE config INTEL_SOC_DTS_THERMAL tristate "Intel SoCs DTS thermal driver" - depends on X86 + depends on X86 && PCI select INTEL_SOC_DTS_IOSF_CORE select THERMAL_WRITABLE_TRIPS help |