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 9d60f400407642cada8596bfcc2437115f0a5f1b..9000921385aa00546c480263fc7d13adc7b6bf37 100644 (file)
--- 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 c8f9eac121a17762d1365acf7aa7bd85e8d40c68..c3da5342f495b2be440d357c761b34ebb07dc3f5 100644 (file)
--- 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>