projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
blackfin
/
cpu
/
cpu.h
diff --git
a/arch/blackfin/cpu/cpu.h
b/arch/blackfin/cpu/cpu.h
index ba85e0b9a5cf07808a62048e456b65ca938493b6..e70560f4de19d185869f9d4abc3ae5dd300b1ad4 100644
(file)
--- a/
arch/blackfin/cpu/cpu.h
+++ b/
arch/blackfin/cpu/cpu.h
@@
-28,7
+28,6
@@
#include <command.h>
void board_reset(void) __attribute__((__weak__));
#include <command.h>
void board_reset(void) __attribute__((__weak__));
-void bfin_reset_or_hang(void) __attribute__((__noreturn__));
void bfin_dump(struct pt_regs *reg);
void bfin_panic(struct pt_regs *reg);
void dump(struct pt_regs *regs);
void bfin_dump(struct pt_regs *reg);
void bfin_panic(struct pt_regs *reg);
void dump(struct pt_regs *regs);