diff --git a/[refs] b/[refs] index eecb718db658..19d84f8bb427 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9bd64952037d0f58eeffa07e30da1fff4c39b8f +refs/heads/master: 85798ec85ec6146bff3af886c06d72cc66940a05 diff --git a/trunk/drivers/staging/iio/Documentation/sysfs-class-iio b/trunk/drivers/staging/iio/Documentation/sysfs-class-iio index 723858215786..ff19f6e22e34 100644 --- a/trunk/drivers/staging/iio/Documentation/sysfs-class-iio +++ b/trunk/drivers/staging/iio/Documentation/sysfs-class-iio @@ -66,7 +66,7 @@ KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: If known for a device, offset to be added to in[m]_raw prior - to scaling by volt[m]_scale in order to obtain voltage in + to scaling by in[_name][m]_scale in order to obtain voltage in millivolts. Not present if the offset is always 0 or unknown. If m is not present, then voltage offset applies to all in channels. May be writable if a variable offset is controlled @@ -111,8 +111,8 @@ KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: If known for a device, scale to be applied to volt[m]_raw post - addition of volt[m]_offset in order to obtain the measured voltage - in millivolts. If shared across all in channels then m is not present. + addition of in[_name][m]_offset in order to obtain the measured + voltage in millivolts. If shared across all in channels then m is not present. What: /sys/.../device[n]/in[m]-in[o]_raw KernelVersion: 2.6.35