---

yaml --- r: 83395 b: refs/heads/master c: f74596d h: refs/heads/master i: 83393: 11101d0 83391: 12674d5 v: v3
git-mirror · Feb 6, 2008 · 4122cd2 · 4122cd2
1 parent 1f3f28e
commit 4122cd2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b03cfb25fa944bc106e816146846dcb48b2e907
+refs/heads/master: f74596d07957235ad9da5120029348b372224a27
diff --git a/trunk/arch/h8300/kernel/irq.c b/trunk/arch/h8300/kernel/irq.c
@@ -14,6 +14,7 @@
 #include <linux/random.h>
 #include <linux/bootmem.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <asm/system.h>
 #include <asm/traps.h>

diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c
@@ -29,6 +29,7 @@
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/pagemap.h>
+#include <linux/interrupt.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
 #include <linux/smp.h>
@@ -599,7 +600,6 @@ static void int_seq_stop(struct seq_file *f, void *v)
 }
 
 
-extern int show_interrupts(struct seq_file *f, void *v); /* In arch code */
 static struct seq_operations int_seq_ops = {
 	.start = int_seq_start,
 	.next  = int_seq_next,

diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
@@ -444,4 +444,6 @@ static inline void init_irq_proc(void)
 }
 #endif
 
+int show_interrupts(struct seq_file *p, void *v);
+
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -444,4 +444,6 @@ static inline void init_irq_proc(void) @@
     }
     #endif
+    int show_interrupts(struct seq_file *p, void *v);
     #endif