From 80da74940261ba636d497628b804f79bc80964c6 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 19 Jan 2011 14:20:13 +0100
Subject: [PATCH] --- yaml --- r: 232103 b: refs/heads/master c:
 30139785e615c97497864a89511db02839fa7bf5 h: refs/heads/master i:   232101:
 022a14f7178c89eb4ea3a8eab30a3d34d0298343   232099:
 86b27369ed56c271d7e2a75f0357c765a947a019   232095:
 e96d277ba252f785d1146520b794c4e159e34680 v: v3

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

diff --git a/[refs] b/[refs]
index 8dafe82d25bd..d4d9f6c93eee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9af7503dbd9c4c5e11fcf253ac93fefc9793dff8
+refs/heads/master: 30139785e615c97497864a89511db02839fa7bf5
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
index 613e62831c55..0a7a4c11d8b1 100644
--- a/trunk/arch/cris/Kconfig
+++ b/trunk/arch/cris/Kconfig
@@ -54,6 +54,8 @@ config CRIS
 	bool
 	default y
 	select HAVE_IDE
+	select HAVE_GENERIC_HARDIRQS
+	select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config HZ
 	int
@@ -67,10 +69,6 @@ menu "General setup"
 
 source "fs/Kconfig.binfmt"
 
-config GENERIC_HARDIRQS
-	bool
-	default y
-
 config ETRAX_CMDLINE
 	string "Kernel command line"
 	default "root=/dev/mtdblock3"
diff --git a/trunk/arch/cris/kernel/irq.c b/trunk/arch/cris/kernel/irq.c
index b6117b464bed..c346952f06dc 100644
--- a/trunk/arch/cris/kernel/irq.c
+++ b/trunk/arch/cris/kernel/irq.c
@@ -62,7 +62,7 @@ int show_interrupts(struct seq_file *p, void *v)
 		for_each_online_cpu(j)
 			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 #endif
-		seq_printf(p, " %14s", irq_desc[i].chip->name);
+		seq_printf(p, " %14s", irq_desc[i].irq_data.chip->name);
 		seq_printf(p, "  %s", action->name);
 
 		for (action=action->next; action; action = action->next)