Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index eaf2f91..45cef3d 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
@@ -1119,6 +1118,7 @@ config SENSORS_LM95241
 config SENSORS_LM95245
        tristate "National Semiconductor LM95245 and compatibles"
        depends on I2C
+       select REGMAP_I2C
        help
          If you say yes here you get support for LM95235 and LM95245
          temperature sensor chips.
@@ -1572,7 +1572,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 +1822,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"