diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/asm-generic/kdebug.h | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
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 */ |