Merge commit 'upstream/master'

[pandora-kernel.git] / include / asm-avr32 / kdebug.h

diff --git a/include/asm-avr32/kdebug.h b/include/asm-avr32/kdebug.h
index de41927..ca4f954 100644 (file)
--- a/include/asm-avr32/kdebug.h
+++ b/include/asm-avr32/kdebug.h
@@ -1,17 +1,11 @@
 #ifndef __ASM_AVR32_KDEBUG_H
 #define __ASM_AVR32_KDEBUG_H
 
-#include <linux/notifier.h>
-
 /* Grossly misnamed. */
 enum die_val {
-       DIE_FAULT,
        DIE_BREAKPOINT,
        DIE_SSTEP,
-       DIE_PAGE_FAULT,
+       DIE_NMI,
 };
 
-int register_page_fault_notifier(struct notifier_block *nb);
-int unregister_page_fault_notifier(struct notifier_block *nb);
-
 #endif /* __ASM_AVR32_KDEBUG_H */