Re: drivers/watchdog/geodewdt.c: build fix

[Jordan Crouse]

On 30/05/08 17:02 +0200, Ingo Molnar wrote:
> 
> * Wim Van Sebroeck <wim@xxxxxxxxx> wrote:
> 
> > Author: Jordan Crouse <jordan.crouse@xxxxxxx>
> > Date:   Mon Jan 21 10:07:00 2008 -0700
> > 
> >     [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
> 
> -tip testing found the following build failure on latest -git:
> 
>   drivers/watchdog/geodewdt.c: In function 'geodewdt_probe':
>   drivers/watchdog/geodewdt.c:225: error: too many arguments to function 'geode_mfgpt_alloc_timer'
>   make[1]: *** [drivers/watchdog/geodewdt.o] Error 1
>   make: *** [drivers/watchdog/geodewdt.o] Error 2
> 
> with this config:
> 
>   http://redhat.com/~mingo/misc/config-Fri_May_30_15_19_52_CEST_2008.bad
> 
> find the fix below.
> 
> Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Acked-by: Jordan Crouse <jordan.crouse@xxxxxxx>

> ---
>  drivers/watchdog/geodewdt.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> Index: tip/drivers/watchdog/geodewdt.c
> ===================================================================
> --- tip.orig/drivers/watchdog/geodewdt.c
> +++ tip/drivers/watchdog/geodewdt.c
> @@ -221,8 +221,7 @@ geodewdt_probe(struct platform_device *d
>  {
>  	int ret, timer;
>  
> -	timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY,
> -					MFGPT_DOMAIN_WORKING, THIS_MODULE);
> +	timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING);
>  
>  	if (timer == -1) {
>  		printk(KERN_ERR "geodewdt:  No timers were available\n");
> 

-- 
Jordan Crouse
Systems Software Development Engineer 
Advanced Micro Devices, Inc.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/