diff --git a/[refs] b/[refs] index 3d44f772105b..d39372d2202e 100644 --- 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 index 8dec4dd57b4e..5a1b4cfea05b 100644 --- a/trunk/arch/h8300/kernel/irq.c +++ b/trunk/arch/h8300/kernel/irq.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 51288db37a0c..c0a90954016f 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -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 index c3db4a00f1fa..dea7598aeff4 100644 --- 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