From f9c37f283c75949f82c83c5920bb56de41dcacab Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 31 May 2011 22:08:28 +0200
Subject: [PATCH] --- yaml --- r: 275388 b: refs/heads/master c:
 978ef7e6d0e02083e4a62ab4411922bdeffa36a4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/m68k/Kconfig         | 1 -
 trunk/arch/m68k/amiga/amiints.c | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b2f0e54e8f2c..33009df16c44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b1bd5f1aa88ce4760c02814bfcbb58ad521984
+refs/heads/master: 978ef7e6d0e02083e4a62ab4411922bdeffa36a4
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
index 9d60f4004076..9000921385aa 100644
--- a/trunk/arch/m68k/Kconfig
+++ b/trunk/arch/m68k/Kconfig
@@ -87,7 +87,6 @@ config MMU_SUN3
 config USE_GENERIC_HARDIRQS
 	bool "Use genirq"
 	depends on MMU
-	depends on !AMIGA
 	depends on !MAC
 	depends on !APOLLO
 	depends on !MVME147
diff --git a/trunk/arch/m68k/amiga/amiints.c b/trunk/arch/m68k/amiga/amiints.c
index c8f9eac121a1..c3da5342f495 100644
--- a/trunk/arch/m68k/amiga/amiints.c
+++ b/trunk/arch/m68k/amiga/amiints.c
@@ -9,6 +9,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#endif
 
 #include <asm/irq.h>
 #include <asm/traps.h>