diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/sh/include/asm/kdebug.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/sh/include/asm/kdebug.h')
| -rw-r--r-- | arch/sh/include/asm/kdebug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/kdebug.h b/arch/sh/include/asm/kdebug.h index 985219f9759e..5f6d2e9ccb7c 100644 --- a/arch/sh/include/asm/kdebug.h +++ b/arch/sh/include/asm/kdebug.h | |||
| @@ -6,6 +6,8 @@ enum die_val { | |||
| 6 | DIE_TRAP, | 6 | DIE_TRAP, |
| 7 | DIE_NMI, | 7 | DIE_NMI, |
| 8 | DIE_OOPS, | 8 | DIE_OOPS, |
| 9 | DIE_BREAKPOINT, | ||
| 10 | DIE_SSTEP, | ||
| 9 | }; | 11 | }; |
| 10 | 12 | ||
| 11 | #endif /* __ASM_SH_KDEBUG_H */ | 13 | #endif /* __ASM_SH_KDEBUG_H */ |