Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / Documentation / hwmon / hwmon-kernel-api.txt

diff --git a/Documentation/hwmon/hwmon-kernel-api.txt b/Documentation/hwmon/hwmon-kernel-api.txt
index f60a29c..ef9d749 100644 (file)
--- a/Documentation/hwmon/hwmon-kernel-api.txt
+++ b/Documentation/hwmon/hwmon-kernel-api.txt
@@ -168,6 +168,7 @@ It contains following fields:
   * hwmon_energy       Energy sensor
   * hwmon_humidity     Humidity sensor
   * hwmon_fan          Fan speed sensor
+  * hwmon_pwm          PWM control
 
 * config: Pointer to a 0-terminated list of configuration values for each
   sensor of the given type. Each value is a combination of bit values
@@ -230,6 +231,7 @@ HWMON_P_xxxx        Power attributes, for use with hwmon_power.
 HWMON_E_xxxx   Energy attributes, for use with hwmon_energy.
 HWMON_H_xxxx   Humidity attributes, for use with hwmon_humidity.
 HWMON_F_xxxx   Fan speed attributes, for use with hwmon_fan.
+HWMON_PWM_xxxx PWM control attributes, for use with hwmon_pwm.
 
 Driver callback functions
 -------------------------