Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

sections: Fix section conflicts in drivers/hwmon

Browse Source 
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Andi Kleen 2012-08-18 10:30:05 -07:00 committed by Guenter Roeck
parent d9875690d9
commit 64f503076f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwmon/coretemp.c
View File

@ -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 },

2
drivers/hwmon/w83627hf.c
View File

@ -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",