diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /include/asm-generic/kdebug.h | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'include/asm-generic/kdebug.h')
| -rw-r--r-- | include/asm-generic/kdebug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/kdebug.h b/include/asm-generic/kdebug.h index 2b799c90b2d4..11e57b6a85fc 100644 --- a/include/asm-generic/kdebug.h +++ b/include/asm-generic/kdebug.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | enum die_val { | 4 | enum die_val { |
| 5 | DIE_UNUSED, | 5 | DIE_UNUSED, |
| 6 | DIE_OOPS=1 | ||
| 6 | }; | 7 | }; |
| 7 | 8 | ||
| 8 | #endif /* _ASM_GENERIC_KDEBUG_H */ | 9 | #endif /* _ASM_GENERIC_KDEBUG_H */ |