Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index eaf2f916d48c52c0315baef4f6784b90f59d7df2..6c82ee240c4cdac544f8a56984d64f8ce515bae8 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -969,7 +969,6 @@ config SENSORS_LM73
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on I2C
-       depends on THERMAL || !THERMAL_OF
        select REGMAP_I2C
        help
          If you say yes here you get support for one common type of
@@ -1572,7 +1571,6 @@ config SENSORS_THMC50
 config SENSORS_TMP102
        tristate "Texas Instruments TMP102"
        depends on I2C
-       depends on THERMAL || !THERMAL_OF
        select REGMAP_I2C
        help
          If you say yes here you get support for Texas Instruments TMP102
@@ -1823,6 +1821,13 @@ config SENSORS_ULTRA45
          This driver provides support for the Ultra45 workstation environmental
          sensors.
 
+config SENSORS_XGENE
+       tristate "APM X-Gene SoC hardware monitoring driver"
+       depends on XGENE_SLIMPRO_MBOX || PCC
+       help
+         If you say yes here you get support for the temperature
+         and power sensors for APM X-Gene SoC.
+
 if ACPI
 
 comment "ACPI drivers"