diff --git a/[refs] b/[refs] index 26fb8f7048d1..421ebe54fa31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d38b049fe8df77c8e9dc48d0fd84555739fbb1a +refs/heads/master: a18546110ed6bec483d55bfffccb2487dfbd77af diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 8f8014285a34..1d24fead51a6 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -548,7 +548,7 @@ static int show_stat(struct seq_file *p, void *v) } seq_printf(p, "intr %llu", (unsigned long long)sum); -#if !defined(CONFIG_PPC64) && !defined(CONFIG_ALPHA) +#if !defined(CONFIG_PPC64) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64) for (i = 0; i < NR_IRQS; i++) seq_printf(p, " %u", kstat_irqs(i)); #endif