diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-15 22:48:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-15 22:48:46 +0200 |
| commit | 93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658 (patch) | |
| tree | 85bf8677d8e8095ef18453199a99c5e4131d217d /arch/blackfin/cpu/cpu.h | |
| parent | dce6538f5d21a0def8a4df5328d536abed3e136a (diff) | |
| parent | d6f324d03d7829a1da1dee8b60f91b173a3976f0 (diff) | |
| download | u-boot-imx-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.zip u-boot-imx-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.tar.gz u-boot-imx-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.tar.bz2 | |
Merge branch 'master' of ../master
Diffstat (limited to 'arch/blackfin/cpu/cpu.h')
| -rw-r--r-- | arch/blackfin/cpu/cpu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/cpu/cpu.h b/arch/blackfin/cpu/cpu.h index 0a13c28..ba85e0b 100644 --- a/arch/blackfin/cpu/cpu.h +++ b/arch/blackfin/cpu/cpu.h @@ -29,10 +29,12 @@ 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 |