Skip to content

Commit

Permalink
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history 
…nel/git/groeck/linux-staging

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
  • Loading branch information
Linus Torvalds committed Aug 20, 2012
2 parents 8a6b521 + 64f5030 commit 807b516
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/coretemp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/w83627hf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 807b516

Please sign in to comment.