diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /drivers/hwmon/w83792d.c | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/hwmon/w83792d.c')
-rw-r--r-- | drivers/hwmon/w83792d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 4ef884c216e2..e407c74bda35 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -463,7 +463,7 @@ show_fan_div(struct device *dev, struct device_attribute *attr, | |||
463 | 463 | ||
464 | /* Note: we save and restore the fan minimum here, because its value is | 464 | /* Note: we save and restore the fan minimum here, because its value is |
465 | determined in part by the fan divisor. This follows the principle of | 465 | determined in part by the fan divisor. This follows the principle of |
466 | least suprise; the user doesn't expect the fan minimum to change just | 466 | least surprise; the user doesn't expect the fan minimum to change just |
467 | because the divisor changed. */ | 467 | because the divisor changed. */ |
468 | static ssize_t | 468 | static ssize_t |
469 | store_fan_div(struct device *dev, struct device_attribute *attr, | 469 | store_fan_div(struct device *dev, struct device_attribute *attr, |