All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Samuel Tardieu <sam@rfc1149.net>,
	Mike Frysinger <vapier.adi@gmail.com>,
	Mingarelli@infomag.iguana.be, Thomas <Thomas.Mingarelli@hp.com>,
	Jordan Crouse <jordan.crouse@amd.com>,
	Chen Gong <g.chen@freescale.com>,
	Gabriel C <nix.or.die@googlemail.com>
Subject: [patch] drivers/watchdog/geodewdt.c: build fix
Date: Fri, 30 May 2008 17:02:50 +0200	[thread overview]
Message-ID: <20080530150250.GA21945@elte.hu> (raw)
In-Reply-To: <20080525100944.GA4084@infomag.infomag.iguana.be>


* 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>
---
 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");

  parent reply	other threads:[~2008-05-30 15:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-25 10:09 [WATCHDOG] v2.6.26-rc3 patches Wim Van Sebroeck
2008-05-25 10:08 ` Alan Cox
2008-05-25 17:05   ` Wim Van Sebroeck
2008-05-30 15:02 ` Ingo Molnar [this message]
2008-05-30 15:39   ` drivers/watchdog/geodewdt.c: build fix Jordan Crouse
2008-05-30 15:54     ` David Brigada
2008-05-30 16:05       ` Jordan Crouse
2008-05-30 16:24         ` Lennart Sorensen
2008-05-30 16:48           ` Jordan Crouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080530150250.GA21945@elte.hu \
    --to=mingo@elte.hu \
    --cc=Mingarelli@infomag.iguana.be \
    --cc=Thomas.Mingarelli@hp.com \
    --cc=akpm@linux-foundation.org \
    --cc=g.chen@freescale.com \
    --cc=jordan.crouse@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nix.or.die@googlemail.com \
    --cc=sam@rfc1149.net \
    --cc=torvalds@linux-foundation.org \
    --cc=vapier.adi@gmail.com \
    --cc=wim@iguana.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.