diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2013-10-16 09:06:32 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-16 09:24:38 -0400 |
| commit | 8c4dba1a5e5ff67380ae8d54fd5756e44dc2da59 (patch) | |
| tree | 3d6eb0b2ff42179bad5e5d9da3127d855c22726b /arch/microblaze/include/asm | |
| parent | 100ea07e331b7898dc774aeba108d66bdd5a5cf5 (diff) | |
| download | u-boot-8c4dba1a5e5ff67380ae8d54fd5756e44dc2da59.tar.gz u-boot-8c4dba1a5e5ff67380ae8d54fd5756e44dc2da59.tar.bz2 u-boot-8c4dba1a5e5ff67380ae8d54fd5756e44dc2da59.zip | |
microblaze: Fix watchdog initialization
The patch:
"blackfin: Move blackfin watchdog driver out of the blackfin arch folder."
(sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63)
changed hw_watchdog_init() prototype which didn't match
with Microblaze one.
This patch fixes the driver and Microblaze initialization.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze/include/asm')
| -rw-r--r-- | arch/microblaze/include/asm/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h index a2a58117b8..5afc8f9e5a 100644 --- a/arch/microblaze/include/asm/processor.h +++ b/arch/microblaze/include/asm/processor.h @@ -16,7 +16,6 @@ extern char __text_start[]; void board_init(void); /* Watchdog functions */ -extern int hw_watchdog_init(void); extern void hw_watchdog_disable(void); #endif /* __ASM_MICROBLAZE_PROCESSOR_H */ |