* patches in the linux-2.6-watchdog-mm git tree
@ 2006-04-06 19:55 Wim Van Sebroeck
0 siblings, 0 replies; only message in thread
From: Wim Van Sebroeck @ 2006-04-06 19:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Hi Andrew,
Following patches have been added to the linux-2.6-watchdog-mm git tree:
Documentation/watchdog/watchdog-api.txt | 3 +++
drivers/char/watchdog/sc1200wdt.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
Changes:
Author: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue Apr 4 20:17:26 2006 -0700
[WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon
Fix the simple watchdog daemon program in Doc/watchdog/watchdog-api.txt
to build cleanly.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Author: Dave Jones <davej@redhat.com>
Date: Mon Apr 3 16:04:48 2006 -0700
[WATCHDOG] sc1200wdt.c printk fix
Fix printk output.
sc1200wdt: build 20020303<3>sc1200wdt: io parameter must be specified
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog-mm.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt
index c5beb54..21ed511 100644
--- a/Documentation/watchdog/watchdog-api.txt
+++ b/Documentation/watchdog/watchdog-api.txt
@@ -36,6 +36,9 @@ timeout or margin. The simplest way to
some data to the device. So a very simple watchdog daemon would look
like this:
+#include <stdlib.h>
+#include <fcntl.h>
+
int main(int argc, const char *argv[]) {
int fd=open("/dev/watchdog",O_WRONLY);
if (fd==-1) {
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 515ce75..20b88f9 100644
--- a/drivers/char/watchdog/sc1200wdt.c
+++ b/drivers/char/watchdog/sc1200wdt.c
@@ -377,7 +377,7 @@ static int __init sc1200wdt_init(void)
{
int ret;
- printk(banner);
+ printk("%s\n", banner);
spin_lock_init(&sc1200wdt_lock);
sema_init(&open_sem, 1);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-04-06 19:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-04-06 19:55 patches in the linux-2.6-watchdog-mm git tree Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).