diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:42:22 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:42:22 -0500 |
| commit | c956662cc3e2475b451afa9a8b639c0ccc49d432 (patch) | |
| tree | 3e799e9dded7ba103544de55d6d54c6c5f98b6da /common | |
| parent | 0dac731d1932027f4f813ec7aede35d5e30dec0e (diff) | |
| parent | 657006a1c46f11784757f9437ffaaa5e0c4dea72 (diff) | |
| download | u-boot-imx-c956662cc3e2475b451afa9a8b639c0ccc49d432.zip u-boot-imx-c956662cc3e2475b451afa9a8b639c0ccc49d432.tar.gz u-boot-imx-c956662cc3e2475b451afa9a8b639c0ccc49d432.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index d25329a..bdad36b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -111,7 +111,7 @@ static int init_func_watchdog_init(void) { # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \ defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ - defined(CONFIG_SH)) + defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG)) hw_watchdog_init(); # endif puts(" Watchdog enabled\n"); |