提交 64f50307 编写于 作者: A Andi Kleen 提交者: Guenter Roeck

sections: Fix section conflicts in drivers/hwmon

Signed-off-by: NAndi Kleen <ak@linux.intel.com>
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
上级 d9875690
...@@ -196,7 +196,7 @@ struct tjmax { ...@@ -196,7 +196,7 @@ struct tjmax {
int tjmax; int tjmax;
}; };
static struct tjmax __cpuinitconst tjmax_table[] = { static const struct tjmax __cpuinitconst tjmax_table[] = {
{ "CPU D410", 100000 }, { "CPU D410", 100000 },
{ "CPU D425", 100000 }, { "CPU D425", 100000 },
{ "CPU D510", 100000 }, { "CPU D510", 100000 },
......
...@@ -1206,7 +1206,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, ...@@ -1206,7 +1206,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
int err = -ENODEV; int err = -ENODEV;
u16 val; u16 val;
static const __initdata char *names[] = { static __initconst char *const names[] = {
"W83627HF", "W83627HF",
"W83627THF", "W83627THF",
"W83697HF", "W83697HF",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册