Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[sfrench/cifs-2.6.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 5422523c03f8638746b8a2b3a7fece4809a28f9c..fdc48a1655e744f4c537334498556e2327136868 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -212,7 +212,7 @@ config HISI_THERMAL
 
 config IMX_THERMAL
        tristate "Temperature sensor driver for Freescale i.MX SoCs"
-       depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST
+       depends on ARCH_MXC || COMPILE_TEST
        depends on NVMEM || !NVMEM
        depends on MFD_SYSCON
        depends on OF
@@ -383,7 +383,7 @@ config INTEL_QUARK_DTS_THERMAL
          underlying BIOS/Firmware.
 
 menu "ACPI INT340X thermal drivers"
-source drivers/thermal/int340x_thermal/Kconfig
+source "drivers/thermal/int340x_thermal/Kconfig"
 endmenu
 
 config INTEL_BXT_PMIC_THERMAL