diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/hwmon/lm87.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/hwmon/lm87.c')
| -rw-r--r-- | drivers/hwmon/lm87.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c index e229daf666de..e6c1b638c971 100644 --- a/drivers/hwmon/lm87.c +++ b/drivers/hwmon/lm87.c | |||
| @@ -421,7 +421,7 @@ static void set_fan_min(struct device *dev, const char *buf, int nr) | |||
| 421 | 421 | ||
| 422 | /* Note: we save and restore the fan minimum here, because its value is | 422 | /* Note: we save and restore the fan minimum here, because its value is |
| 423 | determined in part by the fan clock divider. This follows the principle | 423 | determined in part by the fan clock divider. This follows the principle |
| 424 | of least suprise; the user doesn't expect the fan minimum to change just | 424 | of least surprise; the user doesn't expect the fan minimum to change just |
| 425 | because the divider changed. */ | 425 | because the divider changed. */ |
| 426 | static ssize_t set_fan_div(struct device *dev, const char *buf, | 426 | static ssize_t set_fan_div(struct device *dev, const char *buf, |
| 427 | size_t count, int nr) | 427 | size_t count, int nr) |