Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 700a1657554f4b3b5f4910268343790ddb33c1eb..0727f6d5af87dad2d60206c08b9610de36accb89 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -744,6 +744,18 @@ 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 HWMON_DEBUG_CHIP
        bool "Hardware Monitoring Chip debugging messages"
        default n