[PATCH] booke_wdt: Fix build (unconstify watchdog_info)

Benjamin Herrenschmidt benh at kernel.crashing.org
Tue Apr 27 16:37:00 EST 2010


On Mon, 2010-04-26 at 21:43 +0400, Anton Vorontsov wrote:
> commit 42747d712de56cf2087b702d2ad90af114c53138 ("[WATCHDOG]
> watchdog_info constify") introduced the following build failure:
> 
>    CC      booke_wdt.o
>  booke_wdt.c: In function 'booke_wdt_init':
>  booke_wdt.c:220: error: assignment of read-only variable 'ident'
> 
> Fix this by removing 'const' qualifier from watchdog_info struct.

Should this go via powerpc.git ? If yes, I'll send to Linus asap.

Cheers,
Ben.

> Signed-off-by: Anton Vorontsov <avorontsov at mvista.com>
> ---
>  drivers/watchdog/booke_wdt.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-
> 
> diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
> index 500d383..801ead1 100644
> --- a/drivers/watchdog/booke_wdt.c
> +++ b/drivers/watchdog/booke_wdt.c
> @@ -121,7 +121,7 @@ static ssize_t booke_wdt_write(struct file *file, const char __user *buf,
>  	return count;
>  }
>  
> -static const struct watchdog_info ident = {
> +static struct watchdog_info ident = {
>  	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
>  	.identity = "PowerPC Book-E Watchdog",
>  };




More information about the Linuxppc-dev mailing list