Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e19cf8eb6ccfa10f2ed1414387922d16eebb24ac..4d382ae530923c5e0d90bbb4d043b3d7da5c4a26 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -407,6 +407,13 @@ config SENSORS_CORETEMP
          sensor inside your CPU. Most of the family 6 CPUs
          are supported. Check documentation/driver for details.
 
+config SENSORS_PKGTEMP
+       tristate "Intel processor package temperature sensor"
+       depends on X86 && PCI && EXPERIMENTAL
+       help
+         If you say yes here you get support for the package level temperature
+         sensor inside your CPU. Check documentation/driver for details.
+
 config SENSORS_IBMAEM
        tristate "IBM Active Energy Manager temperature/power sensors and control"
        select IPMI_SI
@@ -446,6 +453,16 @@ config SENSORS_IT87
          This driver can also be built as a module.  If so, the module
          will be called it87.
 
+config SENSORS_JZ4740
+       tristate "Ingenic JZ4740 SoC ADC driver"
+       depends on MACH_JZ4740 && MFD_JZ4740_ADC
+       help
+         If you say yes here you get support for reading adc values from the ADCIN
+         pin on Ingenic JZ4740 SoC based boards.
+
+         This driver can also be build as a module. If so, the module will be
+         called jz4740-hwmon.
+
 config SENSORS_LM63
        tristate "National Semiconductor LM63 and LM64"
        depends on I2C