iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/watchdog/geodewdt.c: build fix

Browse Source 
* Wim Van Sebroeck <wim@iguana.be> wrote:

> Author: Jordan Crouse <jordan.crouse@amd.com>
> 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@elte.hu>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ingo Molnar 2008-05-30 17:02:50 +02:00 committed by Linus Torvalds
parent 1beee8dc8c
commit 57f50ca127
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/watchdog/geodewdt.c
View File

@ -221,8 +221,7 @@ geodewdt_probe(struct platform_device *dev)
{ {
int ret, timer; int ret, timer;
timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY, timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING);
MFGPT_DOMAIN_WORKING, THIS_MODULE);
if (timer == -1) { if (timer == -1) {
printk(KERN_ERR "geodewdt: No timers were available\n"); printk(KERN_ERR "geodewdt: No timers were available\n");