Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index ce52bf2f235ed541660fe4a76d728272203ea816..1d3374ae7eba898d251359e6cf6657228dc60575 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -248,6 +248,18 @@ config SENSORS_ASB100
          This driver can also be built as a module.  If so, the module
          will be called asb100.
 
+config SENSORS_ATK0110
+       tristate "ASUS ATK0110 ACPI hwmon"
+       depends on X86 && ACPI && EXPERIMENTAL
+       help
+         If you say yes here you get support for the ACPI hardware
+         monitoring interface found in many ASUS motherboards. This
+         driver will provide readings of fans, voltages and temperatures
+         through the system firmware.
+
+         This driver can also be built as a module. If so, the module
+         will be called asus_atk0110.
+
 config SENSORS_ATXP1
        tristate "Attansic ATXP1 VID controller"
        depends on I2C && EXPERIMENTAL
@@ -358,6 +370,16 @@ config SENSORS_FSCHMD
          This driver can also be built as a module.  If so, the module
          will be called fschmd.
 
+config SENSORS_G760A
+       tristate "GMT G760A"
+       depends on I2C
+       help
+         If you say yes here you get support for Global Mixed-mode
+         Technology Inc G760A fan speed PWM controller chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called g760a.
+
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on I2C
@@ -973,6 +995,22 @@ config SENSORS_APPLESMC
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of applesmc.
 
+config SENSORS_TSC210X
+       tristate "TI TSC210x battery & temperature sensors"
+       depends on HWMON && SPI_MASTER
+       select SPI_TSC210X
+       help
+         Say Y if your board has a TSC210x chip and you want to
+         have its battery state, auxiliary input and/or temperature
+         sensors exported through hwmon.
+
+         This driver can also be built as a module.  In this case
+         the module will be called tsc210x_sensors.
+
+config SENSORS_OMAP34XX
+       tristate "TI OMAP34xx internal temperature sensor"
+       depends on ARCH_OMAP3 && HIGH_RES_TIMERS
+
 config HWMON_DEBUG_CHIP
        bool "Hardware Monitoring Chip debugging messages"
        default n