summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-03-05 14:39:42 +0000
committerTom Rini <trini@ti.com>2013-03-15 16:13:59 -0400
commita6741bce507151f561250a00f28bcbfb2372ba02 (patch)
tree83d8928a740cb387d5157880c3195890eee05931 /arch/m68k
parent5c1a7ea6adf80decf6a9e998afc6a26508c68dbc (diff)
downloadblackbird-obmc-uboot-a6741bce507151f561250a00f28bcbfb2372ba02.tar.gz
blackbird-obmc-uboot-a6741bce507151f561250a00f28bcbfb2372ba02.zip
Declare watchdog functions in watchdog.h
These functions are only available for powerpc and are not declared in a header file. We want to use the rest function in two places (board_f and board_r), so declare the functions in watchdog.h. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/lib/board.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index b676255dd0..adaccfe69e 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -80,6 +80,7 @@ extern ulong __init_end;
extern ulong __bss_end;
#if defined(CONFIG_WATCHDOG)
+# undef INIT_FUNC_WATCHDOG_INIT
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
# define WATCHDOG_DISABLE watchdog_disable
OpenPOWER on IntegriCloud