From 86b27369ed56c271d7e2a75f0357c765a947a019 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 19 Jan 2011 12:26:32 +0100
Subject: [PATCH] --- yaml --- r: 232099 b: refs/heads/master c:
 51f3f15945aa2ccbc90baf17d912aed9981697b2 h: refs/heads/master i:   232097:
 9dd89ba4c9f48fe35ecec56900a051042d721304   232095:
 e96d277ba252f785d1146520b794c4e159e34680 v: v3

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

diff --git a/[refs] b/[refs]
index 848bdc7f27dc..923bc5fc828e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9f91ef5e3a5bc1d4aa05b5d26c4d9e6dd930750
+refs/heads/master: 51f3f15945aa2ccbc90baf17d912aed9981697b2
diff --git a/trunk/arch/h8300/Kconfig b/trunk/arch/h8300/Kconfig
index 65f897d8c1e9..6df692d1475f 100644
--- a/trunk/arch/h8300/Kconfig
+++ b/trunk/arch/h8300/Kconfig
@@ -2,6 +2,8 @@ config H8300
 	bool
 	default y
 	select HAVE_IDE
+	select HAVE_GENERIC_HARDIRQS
+	select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config SYMBOL_PREFIX
 	string
@@ -47,10 +49,6 @@ config GENERIC_HWEIGHT
 	bool
 	default y
 
-config GENERIC_HARDIRQS
-	bool
-	default y
-
 config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
diff --git a/trunk/arch/h8300/kernel/irq.c b/trunk/arch/h8300/kernel/irq.c
index 0c56735a2ff9..7643d39925d6 100644
--- a/trunk/arch/h8300/kernel/irq.c
+++ b/trunk/arch/h8300/kernel/irq.c
@@ -182,7 +182,7 @@ int show_interrupts(struct seq_file *p, void *v)
 			goto unlock;
 		seq_printf(p, "%3d: ",i);
 		seq_printf(p, "%10u ", kstat_irqs(i));
-		seq_printf(p, " %14s", irq_desc[i].chip->name);
+		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);