diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /drivers/hwmon/coretemp.c | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'drivers/hwmon/coretemp.c')
| -rw-r--r-- | drivers/hwmon/coretemp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index faa16f80db9c..0fa356fe82cc 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
| @@ -196,7 +196,7 @@ struct tjmax { | |||
| 196 | int tjmax; | 196 | int tjmax; |
| 197 | }; | 197 | }; |
| 198 | 198 | ||
| 199 | static struct tjmax __cpuinitconst tjmax_table[] = { | 199 | static const struct tjmax __cpuinitconst tjmax_table[] = { |
| 200 | { "CPU D410", 100000 }, | 200 | { "CPU D410", 100000 }, |
| 201 | { "CPU D425", 100000 }, | 201 | { "CPU D425", 100000 }, |
| 202 | { "CPU D510", 100000 }, | 202 | { "CPU D510", 100000 }, |