diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 13:42:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 13:42:43 -0400 |
commit | 3f1ae223902834d81b54b5d333f9efca07ad656b (patch) | |
tree | dd03e325404fc03692ffd1cd9f4d83ad89584d69 /drivers/watchdog/wdt285.c | |
parent | e2205a156f4dd727097f7f492bf03aa8920b0071 (diff) | |
parent | 36cbaa8777dd5a79cb56c2a3d7d56f0c80b2bab6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] pcwd.c - fix open_allowed type.
[WATCHDOG] fix watchdog/ixp4xx_wdt.c compilation
[WATCHDOG] fix watchdog/wdt285.c compilation
[WATCHDOG] fix watchdog/at91rm9200_wdt.c compilation
[WATCHDOG] fix watchdog/shwdt.c compilation
[WATCHDOG] fix watchdog/txx9wdt.c compilation
[WATCHDOG] MAINTAINERS: remove ZF MACHZ WATCHDOG entry
[WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
Diffstat (limited to 'drivers/watchdog/wdt285.c')
-rw-r--r-- | drivers/watchdog/wdt285.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index c8d7f1b2df0..db362c34958 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c | |||
@@ -208,7 +208,7 @@ static int __init footbridge_watchdog_init(void) | |||
208 | soft_margin); | 208 | soft_margin); |
209 | 209 | ||
210 | if (machine_is_cats()) | 210 | if (machine_is_cats()) |
211 | printk(KERN_WARN | 211 | printk(KERN_WARNING |
212 | "Warning: Watchdog reset may not work on this machine.\n"); | 212 | "Warning: Watchdog reset may not work on this machine.\n"); |
213 | return 0; | 213 | return 0; |
214 | } | 214 | } |