From 3b0f4bf329e9ebd38f278fad2edc2144421bc503 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sat, 30 Apr 2011 23:15:07 +0200
Subject: [PATCH] --- yaml --- r: 250415 b: refs/heads/master c:
 531d2895917566ab0d82faa0696d0576569f1053 h: refs/heads/master i:   250413:
 cd6a52dd9e2b76033b0f321677587a81f547edb5   250411:
 ae6c79e7f03633eafffc5cad31991f299b704026   250407:
 4120267f1ba373efb0c46b455429e3b8d996006f   250399:
 68f4b7e41936a21ca50a61096e420a359fe5f932 v: v3

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

diff --git a/[refs] b/[refs]
index f7e6d7cc2404..17db4be10144 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b4bf78214efcdadbbe5b09c5dff35dcc9bcb3df
+refs/heads/master: 531d2895917566ab0d82faa0696d0576569f1053
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
index 75531da02a40..d66e34c718d0 100644
--- a/trunk/arch/m68k/Kconfig
+++ b/trunk/arch/m68k/Kconfig
@@ -5,6 +5,7 @@ config M68K
 	select HAVE_AOUT if MMU
 	select GENERIC_ATOMIC64 if MMU
 	select HAVE_GENERIC_HARDIRQS if !MMU
+	select GENERIC_IRQ_SHOW if !MMU
 
 config RWSEM_GENERIC_SPINLOCK
 	bool
diff --git a/trunk/arch/m68k/kernel/irq.c b/trunk/arch/m68k/kernel/irq.c
index 15dbc3e9d20c..544b8717d499 100644
--- a/trunk/arch/m68k/kernel/irq.c
+++ b/trunk/arch/m68k/kernel/irq.c
@@ -28,31 +28,3 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 
 	set_irq_regs(oldregs);
 }
-
-int show_interrupts(struct seq_file *p, void *v)
-{
-	struct irqaction *ap;
-	int irq = *((loff_t *) v);
-
-	if (irq == 0)
-		seq_puts(p, "           CPU0\n");
-
-	if (irq < NR_IRQS) {
-		struct irq_desc *desc = irq_to_desc(irq);
-
-		ap = desc->action;
-		if (ap) {
-			seq_printf(p, "%3d: ", irq);
-			seq_printf(p, "%10u ", kstat_irqs(irq));
-			seq_printf(p, "%14s  ", irq_desc_get_chip(desc)->name);
-
-			seq_printf(p, "%s", ap->name);
-			for (ap = ap->next; ap; ap = ap->next)
-				seq_printf(p, ", %s", ap->name);
-			seq_putc(p, '\n');
-		}
-	}
-
-	return 0;
-}
-