diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/sh/include/asm/kdebug.h | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
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 */ |