Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 7e72e922b41c2ca603c8bcde49aa549005d52dbf..7230d4e081964e79fb2963273311a17a83e30b85 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -113,6 +113,16 @@ config SENSORS_DS1621
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 
          This driver can also be built as a module.  If so, the module
          will be called ds1621.
 

+config SENSORS_F71805F
+       tristate "Fintek F71805F/FG"
+       depends on HWMON && EXPERIMENTAL
+       help
+         If you say yes here you get support for hardware monitoring
+         features of the Fintek F71805F/FG chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called f71805f.
+

 config SENSORS_FSCHER
        tristate "FSC Hermes"
        depends on HWMON && I2C && EXPERIMENTAL
 config SENSORS_FSCHER
        tristate "FSC Hermes"
        depends on HWMON && I2C && EXPERIMENTAL


@@ -350,6 +360,18 @@ config SENSORS_VIA686A
          This driver can also be built as a module.  If so, the module
          will be called via686a.
 
          This driver can also be built as a module.  If so, the module
          will be called via686a.
 

+config SENSORS_VT8231
+       tristate "VT8231"
+       depends on HWMON && I2C && PCI && EXPERIMENTAL
+       select HWMON_VID
+       select I2C_ISA
+       help
+         If you say yes here then you get support for the integrated sensors
+         in the VIA VT8231 device.
+
+         This driver can also be built as a module.  If so, the module
+         will be called vt8231.
+

 config SENSORS_W83781D
        tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
        depends on HWMON && I2C
 config SENSORS_W83781D
        tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
        depends on HWMON && I2C


@@ -418,12 +440,11 @@ config SENSORS_HDAPS
        help
          This driver provides support for the IBM Hard Drive Active Protection
          System (hdaps), which provides an accelerometer and other misc. data.
        help
          This driver provides support for the IBM Hard Drive Active Protection
          System (hdaps), which provides an accelerometer and other misc. data.

-         Supported laptops include the IBM ThinkPad T41, T42, T43, and R51.
-         The accelerometer data is readable via sysfs.
+         ThinkPads starting with the R50, T41, and X40 are supported.  The
+         accelerometer data is readable via sysfs.

 
 

-         This driver also provides an input class device, allowing the
-         laptop to act as a pinball machine-esque mouse.  This is off by
-         default but enabled via sysfs or the module parameter "mousedev".
+         This driver also provides an absolute input class device, allowing
+         the laptop to act as a pinball machine-esque joystick.

 
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of hdaps.
 
          Say Y here if you have an applicable laptop and want to experience
          the awesome power of hdaps.