aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/watchdog/sc1200wdt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-19 16:41:59 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-19 16:41:59 -0700
commitb0c51b7d650d5109c8e71e19d5e7ce9b71af7dff (patch)
treedcbb5da853601a2e80829402adbd03435469eb10 /drivers/char/watchdog/sc1200wdt.c
parentee433530d96a7b0af24ab616e5b51f1d89f9ae38 (diff)
parent655516c80ccb3ab2ba2d3063715889b00552a8b3 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] s3c2410_wdt.c stop watchdog after boot [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7 [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon [WATCHDOG] sc1200wdt.c printk fix
Diffstat (limited to 'drivers/char/watchdog/sc1200wdt.c')
-rw-r--r--drivers/char/watchdog/sc1200wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c
index 515ce757204..20b88f9b7be 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);