Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[cascardo/linux.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 4166c10..2d702ca 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -328,31 +328,9 @@ config INTEL_QUARK_DTS_THERMAL
          hot & critical. The critical trip point default value is set by
          underlying BIOS/Firmware.
 
-config INT340X_THERMAL
-       tristate "ACPI INT340X thermal drivers"
-       depends on X86 && ACPI
-       select THERMAL_GOV_USER_SPACE
-       select ACPI_THERMAL_REL
-       select ACPI_FAN
-       select INTEL_SOC_DTS_IOSF_CORE
-       select THERMAL_WRITABLE_TRIPS
-       help
-         Newer laptops and tablets that use ACPI may have thermal sensors and
-         other devices with thermal control capabilities outside the core
-         CPU/SOC, for thermal safety reasons.
-         They are exposed for the OS to use via the INT3400 ACPI device object
-         as the master, and INT3401~INT340B ACPI device objects as the slaves.
-         Enable this to expose the temperature information and cooling ability
-         from these objects to userspace via the normal thermal framework.
-         This means that a wide range of applications and GUI widgets can show
-         the information to the user or use this information for making
-         decisions. For example, the Intel Thermal Daemon can use this
-         information to allow the user to select his laptop to run without
-         turning on the fans.
-
-config ACPI_THERMAL_REL
-       tristate
-       depends on ACPI
+menu "ACPI INT340X thermal drivers"
+source drivers/thermal/int340x_thermal/Kconfig
+endmenu
 
 config INTEL_PCH_THERMAL
        tristate "Intel PCH Thermal Reporting Driver"