Merge branch 'mem' of git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / arch / blackfin / cpu / cpu.h

diff --git a/arch/blackfin/cpu/cpu.h b/arch/blackfin/cpu/cpu.h
index 0a13c285e0e468601be51a6206e5b830f1fa0f86..e70560f4de19d185869f9d4abc3ae5dd300b1ad4 100644 (file)
--- a/arch/blackfin/cpu/cpu.h
+++ b/arch/blackfin/cpu/cpu.h
@@ -28,11 +28,12 @@
 #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);
 
 asmlinkage void trap(void);
+asmlinkage void evt_nmi(void);
 asmlinkage void evt_default(void);
 
 #endif