diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 13:11:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 13:11:00 -0700 |
| commit | 807b5169e230b264b7db099f5c694e7df2ff3790 (patch) | |
| tree | 6ddd02441c199102d54b7a6e20b4dea2c94b2686 | |
| parent | 8a6b52140fc41fc5ed7251556035a069486979ab (diff) | |
| parent | 64f503076f9921fc714a2c79fb0fa520869d2c08 (diff) | |
| download | linux-3.10-807b5169e230b264b7db099f5c694e7df2ff3790.tar.gz linux-3.10-807b5169e230b264b7db099f5c694e7df2ff3790.tar.bz2 linux-3.10-807b5169e230b264b7db099f5c694e7df2ff3790.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
| -rw-r--r-- | drivers/hwmon/coretemp.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/w83627hf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index faa16f80db9..0fa356fe82c 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -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 }, diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index ab4825205a9..5b1a6a66644 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c @@ -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", |