diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/hwmon/lm85.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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 cf47e6e476e..250d099ca39 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*/ |