diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/mips/include/asm/kdebug.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/mips/include/asm/kdebug.h')
| -rw-r--r-- | arch/mips/include/asm/kdebug.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/include/asm/kdebug.h b/arch/mips/include/asm/kdebug.h new file mode 100644 index 000000000000..5bf62aafc890 --- /dev/null +++ b/arch/mips/include/asm/kdebug.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #ifndef _ASM_MIPS_KDEBUG_H | ||
| 2 | #define _ASM_MIPS_KDEBUG_H | ||
| 3 | |||
| 4 | #include <linux/notifier.h> | ||
| 5 | |||
| 6 | enum die_val { | ||
| 7 | DIE_OOPS = 1, | ||
| 8 | DIE_FP, | ||
| 9 | DIE_TRAP, | ||
| 10 | DIE_RI, | ||
| 11 | }; | ||
| 12 | |||
| 13 | #endif /* _ASM_MIPS_KDEBUG_H */ | ||