diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-01-17 23:08:42 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-17 23:08:42 +0100 |
| commit | 3e3989619f5ed3ee28002d985f3da28540586ab9 (patch) | |
| tree | d4434455cafdc0c750aa26e642949232ffd0b2d3 /cpu/blackfin/watchdog.c | |
| parent | 64917ca38933d10b3763f61df7a1e58e1e127b52 (diff) | |
| parent | 846a6391e4bc9fdd721753a1021953ff0ca17c27 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'cpu/blackfin/watchdog.c')
| -rw-r--r-- | cpu/blackfin/watchdog.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpu/blackfin/watchdog.c b/cpu/blackfin/watchdog.c index b47c6b688d..1886bda0ae 100644 --- a/cpu/blackfin/watchdog.c +++ b/cpu/blackfin/watchdog.c @@ -1,7 +1,7 @@ /* * watchdog.c - driver for Blackfin on-chip watchdog * - * Copyright (c) 2007-2008 Analog Devices Inc. + * Copyright (c) 2007-2009 Analog Devices Inc. * * Licensed under the GPL-2 or later. */ @@ -10,7 +10,6 @@ #include <watchdog.h> #include <asm/blackfin.h> -#ifdef CONFIG_HW_WATCHDOG void hw_watchdog_reset(void) { bfin_write_WDOG_STAT(0); @@ -22,4 +21,3 @@ void hw_watchdog_init(void) hw_watchdog_reset(); bfin_write_WDOG_CTL(0x0); } -#endif |