aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/hwmon/lm85
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 02:42:53 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 02:42:53 +0100
commit506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch)
tree03de82e812f00957aa6276dac2fe51c3358e88d7 /Documentation/hwmon/lm85
parente1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadkernel_samsung_crespo-506c10f26c481b7f8ef27c1c79290f68989b2e9e.zip
kernel_samsung_crespo-506c10f26c481b7f8ef27c1c79290f68989b2e9e.tar.gz
kernel_samsung_crespo-506c10f26c481b7f8ef27c1c79290f68989b2e9e.tar.bz2
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts: include/linux/kernel_stat.h
Diffstat (limited to 'Documentation/hwmon/lm85')
-rw-r--r--Documentation/hwmon/lm852
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85
index 4006207..a136808 100644
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
@@ -164,7 +164,7 @@ configured individually according to the following options.
temperature. (PWM value from 0 to 255)
* pwm#_auto_pwm_minctl - this flags selects for temp#_auto_temp_off temperature
- the bahaviour of fans. Write 1 to let fans spinning at
+ the behaviour of fans. Write 1 to let fans spinning at
pwm#_auto_pwm_min or write 0 to let them off.
NOTE: It has been reported that there is a bug in the LM85 that causes the flag