drivers/watchdog/geodewdt.c: build fix

* Wim Van Sebroeck <[email protected]> wrote:

> Author: Jordan Crouse <[email protected]>
> 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 <[email protected]>
Acked-by: Jordan Crouse <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index f85b19625f9719c3e59ceb48aeb5b571fb28cc93..30d09cbbad949beeeee573bc0a31724dc38d8619 100644 (file)
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -221,8 +221,7 @@ geodewdt_probe(struct platform_device *dev)
 {
        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");