summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/processor.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-05-11 00:06:03 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-05-11 00:06:03 +0200
commite825b100d209a9d3c79b2998452cafa94eec986a (patch)
treee1654c4d745839eba8d37f67d15acde79382e23e /arch/microblaze/include/asm/processor.h
parentb03b25caea1ff3a501161f5bc1ad5e5b5b124e0c (diff)
parent66a62ce0dc48d2319938c72f34a562f519c5d5c2 (diff)
downloadolio-uboot-2014.01-e825b100d209a9d3c79b2998452cafa94eec986a.tar.xz
olio-uboot-2014.01-e825b100d209a9d3c79b2998452cafa94eec986a.zip
Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/microblaze/include/asm/processor.h')
-rw-r--r--arch/microblaze/include/asm/processor.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 2c4d5ffc5..d33faeb7d 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -31,4 +31,8 @@ extern char __text_start[];
/* Microblaze board initialization function */
void board_init(void);
+/* Watchdog functions */
+extern int hw_watchdog_init(void);
+extern void hw_watchdog_disable(void);
+
#endif /* __ASM_MICROBLAZE_PROCESSOR_H */