From c60c7e9272eb630d8b880b70099b00c37df4c679 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 29 Mar 2011 14:05:13 +0100
Subject: [PATCH] --- yaml --- r: 243402 b: refs/heads/master c:
 a9554c3a5d02d50aeff08203ca8dd1e2dffdaa0d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9a3884aa39e8..0bbbb57455c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12516469756f773ac756ac73c4070ba8efef155a
+refs/heads/master: a9554c3a5d02d50aeff08203ca8dd1e2dffdaa0d
diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig
index 968a33027831..3824132dba9e 100644
--- a/trunk/arch/frv/Kconfig
+++ b/trunk/arch/frv/Kconfig
@@ -6,6 +6,7 @@ config FRV
 	select HAVE_IRQ_WORK
 	select HAVE_PERF_EVENTS
 	select HAVE_GENERIC_HARDIRQS
+	select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config ZONE_DMA
 	bool
diff --git a/trunk/arch/frv/kernel/irq.c b/trunk/arch/frv/kernel/irq.c
index deaba569007f..d2365a7d7c57 100644
--- a/trunk/arch/frv/kernel/irq.c
+++ b/trunk/arch/frv/kernel/irq.c
@@ -74,7 +74,8 @@ int show_interrupts(struct seq_file *p, void *v)
 			seq_printf(p, "%3d: ", i);
 			for_each_present_cpu(cpu)
 				seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));
-			seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");
+			seq_printf(p, " %10s",
+				   irq_desc[i].irq_data.chip->name ? : "-");
 			seq_printf(p, "  %s", action->name);
 			for (action = action->next;
 			     action;