diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-06-19 15:43:29 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-17 14:30:41 +0800 |
commit | d8054749c6795073cb427465a726213d45898f68 (patch) | |
tree | 8639e01d8b4e1c216c09d12fae1e4a887add3edf /drivers | |
parent | 6306e68a63f26219f3b1f948e96ba387ddccb272 (diff) | |
download | linux-stable-d8054749c6795073cb427465a726213d45898f68.tar.gz linux-stable-d8054749c6795073cb427465a726213d45898f68.tar.bz2 linux-stable-d8054749c6795073cb427465a726213d45898f68.zip |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/thermal/Kconfig | 1 |
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 config ACPI_FAN tristate "Fan" - select THERMAL + depends on THERMAL default y help 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 depends on X86 && ACPI select THERMAL_GOV_USER_SPACE select ACPI_THERMAL_REL + select ACPI_FAN help Newer laptops and tablets that use ACPI may have thermal sensors and other devices with thermal control capabilities outside the core |