lkml.org 
[lkml]   [2012]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 14/31] sections: Fix section conflicts in drivers/hwmon
On Sat, Aug 18, 2012 at 10:30:05AM -0700, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> Signed-off-by: Andi Kleen <ak@linux.intel.com>

Applied.

Looks like you did not include maintainers and/or subject mailing lists in your
patch series, so I guess you won't get much feedback.

Guenter

> ---
> drivers/hwmon/coretemp.c | 2 +-
> 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 faa16f8..0fa356f 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 ab48252..5b1a6a6 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",
> --
> 1.7.7.6
>
>


\
 
 \ /
  Last update: 2012-08-19 02:01    [W:0.357 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site