mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
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>
This commit is contained in:
parent
d9875690d9
commit
64f503076f
@ -196,7 +196,7 @@ struct tjmax {
|
||||
int tjmax;
|
||||
};
|
||||
|
||||
static struct tjmax __cpuinitconst tjmax_table[] = {
|
||||
static const struct tjmax __cpuinitconst tjmax_table[] = {
|
||||
{ "CPU D410", 100000 },
|
||||
{ "CPU D425", 100000 },
|
||||
{ "CPU D510", 100000 },
|
||||
|
@ -1206,7 +1206,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
|
||||
int err = -ENODEV;
|
||||
u16 val;
|
||||
|
||||
static const __initdata char *names[] = {
|
||||
static __initconst char *const names[] = {
|
||||
"W83627HF",
|
||||
"W83627THF",
|
||||
"W83697HF",
|
||||
|
Loading…
Reference in New Issue
Block a user