aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-06-19 03:43:29 -0400
committerZhang Rui <rui.zhang@intel.com>2014-10-17 02:30:41 -0400
commitd8054749c6795073cb427465a726213d45898f68 (patch)
tree8639e01d8b4e1c216c09d12fae1e4a887add3edf
parent6306e68a63f26219f3b1f948e96ba387ddccb272 (diff)
Thermal: int340x thermal: select ACPI fan driver
we share the same driver for both ACPI predefined Fan device and INT3404 Fan device, thus we should select the ACPI Fan driver when int340x thermal drivers are enabeld. Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r--drivers/acpi/Kconfig2
-rw-r--r--drivers/thermal/Kconfig1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index d0f3265fb85d..b23fe37f67c0 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -144,7 +144,7 @@ config ACPI_VIDEO
144 144
145config ACPI_FAN 145config ACPI_FAN
146 tristate "Fan" 146 tristate "Fan"
147 select THERMAL 147 depends on THERMAL
148 default y 148 default y
149 help 149 help
150 This driver supports ACPI fan devices, allowing user-mode 150 This driver supports ACPI fan devices, allowing user-mode
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 3a8929222cab..e65ca2f8917e 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -224,6 +224,7 @@ config INT340X_THERMAL
224 depends on X86 && ACPI 224 depends on X86 && ACPI
225 select THERMAL_GOV_USER_SPACE 225 select THERMAL_GOV_USER_SPACE
226 select ACPI_THERMAL_REL 226 select ACPI_THERMAL_REL
227 select ACPI_FAN
227 help 228 help
228 Newer laptops and tablets that use ACPI may have thermal sensors and 229 Newer laptops and tablets that use ACPI may have thermal sensors and
229 other devices with thermal control capabilities outside the core 230 other devices with thermal control capabilities outside the core