diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/hwmon/lm85.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/hwmon/lm85.c')
| -rw-r--r-- | drivers/hwmon/lm85.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index cf47e6e476ed..250d099ca398 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c | |||
| @@ -130,7 +130,7 @@ enum chips { | |||
| 130 | these macros are called: arguments may be evaluated more than once. | 130 | these macros are called: arguments may be evaluated more than once. |
| 131 | */ | 131 | */ |
| 132 | 132 | ||
| 133 | /* IN are scaled acording to built-in resistors */ | 133 | /* IN are scaled according to built-in resistors */ |
| 134 | static const int lm85_scaling[] = { /* .001 Volts */ | 134 | static const int lm85_scaling[] = { /* .001 Volts */ |
| 135 | 2500, 2250, 3300, 5000, 12000, | 135 | 2500, 2250, 3300, 5000, 12000, |
| 136 | 3300, 1500, 1800 /*EMC6D100*/ | 136 | 3300, 1500, 1800 /*EMC6D100*/ |