summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/wdt285.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 13:56:44 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-13 13:56:44 +0200
commit73909f7a665991013dcff42a815fda76d3a7300a (patch)
tree84bb9899e2204bf6af6fd4f249bb909c2a89faf8 /drivers/watchdog/wdt285.c
parentd6672c501852d577097f6757c311d937aca0b04b (diff)
parent30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff)
downloadop-kernel-dev-73909f7a665991013dcff42a815fda76d3a7300a.zip
op-kernel-dev-73909f7a665991013dcff42a815fda76d3a7300a.tar.gz
Merge commit 'v2.6.27-rc3' into core/urgent
Diffstat (limited to 'drivers/watchdog/wdt285.c')
-rw-r--r--drivers/watchdog/wdt285.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index c8d7f1b..db362c3 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -208,7 +208,7 @@ static int __init footbridge_watchdog_init(void)
soft_margin);
if (machine_is_cats())
- printk(KERN_WARN
+ printk(KERN_WARNING
"Warning: Watchdog reset may not work on this machine.\n");
return 0;
}
OpenPOWER on IntegriCloud