lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Browse Source 
Pull a hwmon fix from Guenter Roeck:
 "One patch with section conflict fixes."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  sections: Fix section conflicts in drivers/hwmon
This commit is contained in:
Linus Torvalds
2012-08-20 13:11:00 -07:00
parent 8a6b52140f 64f503076f
commit 807b5169e2
2 changed files with 2 additions and 2 deletions
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;
};
static struct tjmax __cpuinitconst tjmax_table[] = {
static const struct tjmax __cpuinitconst tjmax_table[] = {
{ "CPU D410", 100000 },
{ "CPU D425", 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;
u16 val;
static const __initdata char *names[] = {
static __initconst char *const names[] = {
"W83627HF",
"W83627THF",
"W83697HF",