Merge tag 'uapi-20121219' into for-linus

[karo-tx-linux.git] / Documentation / hwmon / it87

diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87
index 87850d86c55995fe895524cf9550c38f8fd90bb0..8386aadc0a8214df209d49c1c325b630c8392c5c 100644 (file)
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
@@ -209,3 +209,13 @@ doesn't use CPU cycles.
 Trip points must be set properly before switching to automatic fan speed
 control mode. The driver will perform basic integrity checks before
 actually switching to automatic control mode.
+
+
+Temperature offset attributes
+-----------------------------
+
+The driver supports temp[1-3]_offset sysfs attributes to adjust the reported
+temperature for thermal diodes or diode-connected thermal transistors.
+If a temperature sensor is configured for thermistors, the attribute values
+are ignored. If the thermal sensor type is Intel PECI, the temperature offset
+must be programmed to the critical CPU temperature.