diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-20 18:18:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-20 18:18:19 -0700 |
| commit | 584f79046780e10cb24367a691f8c28398a00e84 (patch) | |
| tree | b8d8f387b06141c64797721a3f119015c9823caa /Documentation/hwmon/smm665 | |
| parent | 18995ba5ab93942a0ddae00e96b94717e9fd9895 (diff) | |
| parent | e428d8d3bd164ad36fb545b2162bdfcb8100dc08 (diff) | |
| download | linux-584f79046780e10cb24367a691f8c28398a00e84.tar.gz | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (max34440) Add driver documentation
hwmon: (max16064) Add driver documentation
hwmon: (max8688) Add driver documentation
hwmon: (pmbus) Documentation updates
hwmon: (smm665) Fix spelling error in driver documentation
hwmon: (pmbus) Removed unused variable from struct pmbus_data
hwmon: Add submitting-patches checklist to documentation
Diffstat (limited to 'Documentation/hwmon/smm665')
| -rw-r--r-- | Documentation/hwmon/smm665 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/hwmon/smm665 b/Documentation/hwmon/smm665 index 3820fc9ca52d..59e316140542 100644 --- a/Documentation/hwmon/smm665 +++ b/Documentation/hwmon/smm665 @@ -150,8 +150,8 @@ in8_crit_alarm Channel F critical alarm in9_crit_alarm AIN1 critical alarm in10_crit_alarm AIN2 critical alarm -temp1_input Chip tempererature -temp1_min Mimimum chip tempererature -temp1_max Maximum chip tempererature -temp1_crit Critical chip tempererature +temp1_input Chip temperature +temp1_min Mimimum chip temperature +temp1_max Maximum chip temperature +temp1_crit Critical chip temperature temp1_crit_alarm Temperature critical alarm |