From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 29 Mar 2011 13:05:13 +0000 (+0100)
Subject: frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a9554c3a5d02d50aeff08203ca8dd1e2dffdaa0d;p=deliverable%2Flinux.git

frv: Select GENERIC_HARDIRQS_NO_DEPRECATED

All chips converted

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>
---

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 968a33027831..3824132dba9e 100644
--- a/arch/frv/Kconfig
+++ b/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/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index deaba569007f..d2365a7d7c57 100644
--- a/arch/frv/kernel/irq.c
+++ b/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;