Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon: Add Asus ATK0110 support
  hwmon: (lm95241) Convert to new-style i2c driver

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9b17dffc1c01..0e8a9185f676 100644
--- 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