From 5002cb38dfbd15e3ad4c10049b511fba53f897b3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 24 Mar 2011 19:15:36 +0100
Subject: [PATCH] --- yaml --- r: 242539 b: refs/heads/master c:
 9f7b21871355d00ea0aa4dc84e44f81d90a53f55 h: refs/heads/master i:   242537:
 e26198645cc4d9e73be7f8e7354c85a981f2a204   242535:
 5b8297c0b9ea98377a6d921ba23f3de8fdc5ca0f v: v3

---
 [refs]                        |  2 +-
 trunk/arch/h8300/Kconfig      |  1 +
 trunk/arch/h8300/kernel/irq.c | 31 -------------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 736d453b017c..91d88c8817e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b04690a358ea44c35ad7e3af08ae4544d2175f3
+refs/heads/master: 9f7b21871355d00ea0aa4dc84e44f81d90a53f55
diff --git a/trunk/arch/h8300/Kconfig b/trunk/arch/h8300/Kconfig
index 6df692d1475f..f94d4e603152 100644
--- a/trunk/arch/h8300/Kconfig
+++ b/trunk/arch/h8300/Kconfig
@@ -4,6 +4,7 @@ config H8300
 	select HAVE_IDE
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_HARDIRQS_NO_DEPRECATED
+	select GENERIC_IRQ_SHOW
 
 config SYMBOL_PREFIX
 	string
diff --git a/trunk/arch/h8300/kernel/irq.c b/trunk/arch/h8300/kernel/irq.c
index 5729f64cf575..1f67fed476af 100644
--- a/trunk/arch/h8300/kernel/irq.c
+++ b/trunk/arch/h8300/kernel/irq.c
@@ -164,34 +164,3 @@ asmlinkage void do_IRQ(int irq)
 	generic_handle_irq(irq);
 	irq_exit();
 }
-
-#if defined(CONFIG_PROC_FS)
-int show_interrupts(struct seq_file *p, void *v)
-{
-	int i = *(loff_t *) v;
-	struct irqaction * action;
-	unsigned long flags;
-
-	if (i == 0)
-		seq_puts(p, "           CPU0");
-
-	if (i < NR_IRQS) {
-		raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
-		action = irq_desc[i].action;
-		if (!action)
-			goto unlock;
-		seq_printf(p, "%3d: ",i);
-		seq_printf(p, "%10u ", kstat_irqs(i));
-		seq_printf(p, " %14s", irq_desc[i].irq_data.chip->name);
-		seq_printf(p, "-%-8s", irq_desc[i].name);
-		seq_printf(p, "  %s", action->name);
-
-		for (action=action->next; action; action = action->next)
-			seq_printf(p, ", %s", action->name);
-		seq_putc(p, '\n');
-unlock:
-		raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-	}
-	return 0;
-}
-#endif