git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
avr32
/
include
/
asm
/
kdebug.h
diff --git
a/arch/avr32/include/asm/kdebug.h
b/arch/avr32/include/asm/kdebug.h
index ca4f9542365afdd27a061ca22e12448afd0a6a46..f930ce28680301776264d8b0bda29b388ea532cd 100644
(file)
--- a/
arch/avr32/include/asm/kdebug.h
+++ b/
arch/avr32/include/asm/kdebug.h
@@
-6,6
+6,7
@@
enum die_val {
DIE_BREAKPOINT,
DIE_SSTEP,
DIE_NMI,
+ DIE_OOPS,
};
#endif /* __ASM_AVR32_KDEBUG_H */