---

yaml --- r: 91355 b: refs/heads/master c: 46acb55 h: refs/heads/master i: 91353: c5954b8 91351: 7f1d5e8 v: v3
git-mirror · Apr 20, 2008 · e141dbd · e141dbd
1 parent 9c59df2
commit e141dbd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 131 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62c6df62f9575cffd673bfc395270e6896a12a60
+refs/heads/master: 46acb55b4b745256a33b2eaeb6d21fffdb091745
diff --git a/trunk/arch/avr32/mach-at32ap/intc.c b/trunk/arch/avr32/mach-at32ap/intc.c
@@ -13,7 +13,6 @@
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 
-#include <asm/intc.h>
 #include <asm/io.h>
 
 #include "intc.h"

diff --git a/trunk/arch/avr32/oprofile/op_model_avr32.c b/trunk/arch/avr32/oprofile/op_model_avr32.c
@@ -16,7 +16,6 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 
-#include <asm/intc.h>
 #include <asm/sysreg.h>
 #include <asm/system.h>
 

diff --git a/trunk/include/asm-avr32/intc.h b/trunk/include/asm-avr32/intc.h
diff --git a/trunk/include/asm-avr32/irq.h b/trunk/include/asm-avr32/irq.h
@@ -14,6 +14,11 @@
 #ifndef __ASSEMBLER__
 int nmi_enable(void);
 void nmi_disable(void);
+
+/*
+ * Returns a bitmask of pending interrupts in a group.
+ */
+extern unsigned long intc_get_pending(unsigned int group);
 #endif
 
 #endif /* __ASM_AVR32_IOCTLS_H */