projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d987569)
sections: Fix section conflicts in drivers/hwmon
authorAndi Kleen <ak@linux.intel.com>
Sat, 18 Aug 2012 17:30:05 +0000 (10:30 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Sat, 18 Aug 2012 23:17:43 +0000 (16:17 -0700)
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/coretemp.c patch | blob | blame | history
drivers/hwmon/w83627hf.c patch | blob | blame | history

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index faa16f80db9cf652bbc75aaa7e5fd0e73b788ca4..0fa356fe82ccc00fc6a70704627da99bb66fc49a 100644 (file)
--- 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 ab4825205a9db30436404c64a9ee4d79acc2d535..5b1a6a666441f242ac63f21d9b9359464ced3f97 100644 (file)
--- 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",