From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 31 May 2011 20:08:28 +0000 (+0200)
Subject: m68k/amiga: Convert Amiga to genirq
X-Git-Tag: firefly_0821_release~3680^2~4120^2~12
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=978ef7e6d0e02083e4a62ab4411922bdeffa36a4;p=firefly-linux-kernel-4.4.55.git

m68k/amiga: Convert Amiga to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 9d60f4004076..9000921385aa 100644
--- a/arch/m68k/Kconfig
+++ b/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/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c
index c8f9eac121a1..c3da5342f495 100644
--- a/arch/m68k/amiga/amiints.c
+++ b/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>