提交 57f50ca1 编写于 作者: I Ingo Molnar 提交者: Linus Torvalds

drivers/watchdog/geodewdt.c: build fix

* 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: NIngo Molnar <mingo@elte.hu>
Acked-by: NJordan Crouse <jordan.crouse@amd.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 1beee8dc
...@@ -221,8 +221,7 @@ geodewdt_probe(struct platform_device *dev) ...@@ -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");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册