diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/hwmon/adm1029.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/hwmon/adm1029.c')
| -rw-r--r-- | drivers/hwmon/adm1029.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c index 36718150b475..e845b75ccee4 100644 --- a/drivers/hwmon/adm1029.c +++ b/drivers/hwmon/adm1029.c | |||
| @@ -432,7 +432,7 @@ static int adm1029_remove(struct i2c_client *client) | |||
| 432 | } | 432 | } |
| 433 | 433 | ||
| 434 | /* | 434 | /* |
| 435 | function that update the status of the chips (temperature for exemple) | 435 | function that update the status of the chips (temperature for example) |
| 436 | */ | 436 | */ |
| 437 | static struct adm1029_data *adm1029_update_device(struct device *dev) | 437 | static struct adm1029_data *adm1029_update_device(struct device *dev) |
| 438 | { | 438 | { |