diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 17:37:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 17:37:28 -0400 |
| commit | ee7cbabbd359b5d9a60de3d5f1693163e07987ca (patch) | |
| tree | 29c3b01f8cdb26ccf69acaf5d0a64eefab87f7b3 /drivers/watchdog/at91rm9200_wdt.c | |
| parent | a152db71d962f405f7e9be5c818bddf6d1be50a7 (diff) | |
| parent | 3ccd3ec6d4a7750c49c4d2bbcc1d0e82cd4c8a7f (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] removed unused #include <version.h>
[WATCHDOG] at91rm9200_wdt.c: fix misleading indentation
[WATCHDOG] mpc8xxx_wdt: fix modular build
[WATCHDOG] hpwdt.c kdebug support
[WATCHDOG] Add support for the IDT RC32434 watchdog
[WATCHDOG] Add support for the built-int RDC R-321x SoC watchdog
[WATHDOG] delete unused driver mpc8xx_wdt.c
[WATCHDOG] Fix s3c2410_wdt driver coding style issues
[WATCHDOG] Clean out header of s3c2410_wdt driver.
[WATCHDOG] Fix NULL usage in s3c2410_wdt driver.
Diffstat (limited to 'drivers/watchdog/at91rm9200_wdt.c')
| -rw-r--r-- | drivers/watchdog/at91rm9200_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index d061f0ad2d20..993e5f52afef 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c | |||
| @@ -241,7 +241,7 @@ static int at91wdt_resume(struct platform_device *pdev) | |||
| 241 | { | 241 | { |
| 242 | if (at91wdt_busy) | 242 | if (at91wdt_busy) |
| 243 | at91_wdt_start(); | 243 | at91_wdt_start(); |
| 244 | return 0; | 244 | return 0; |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | #else | 247 | #else |