Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 64f503076f9921fc714a2c79fb0fa520869d2c08

Authored by Andi Kleen
Committed by Guenter Roeck
1 parent d9875690d9
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

sections: Fix section conflicts in drivers/hwmon 

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/hwmon/coretemp.c
Diff comments   View file @ 64f5030
... ... @@ -196,7 +196,7 @@
196 196 int tjmax;
197 197 };
198 198  
199   -static struct tjmax __cpuinitconst tjmax_table[] = {
  199 +static const struct tjmax __cpuinitconst tjmax_table[] = {
200 200 { "CPU D410", 100000 },
201 201 { "CPU D425", 100000 },
202 202 { "CPU D510", 100000 },
drivers/hwmon/w83627hf.c
Diff comments   View file @ 64f5030
... ... @@ -1206,7 +1206,7 @@
1206 1206 int err = -ENODEV;
1207 1207 u16 val;
1208 1208  
1209   - static const __initdata char *names[] = {
  1209 + static __initconst char *const names[] = {
1210 1210 "W83627HF",
1211 1211 "W83627THF",
1212 1212 "W83697HF",