summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-05-31 22:08:28 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 22:35:50 +0100
commit978ef7e6d0e02083e4a62ab4411922bdeffa36a4 (patch)
tree71d6caf424e5e6fc26293673e2c80afbde85732f
parent92b1bd5f1aa88ce4760c02814bfcbb58ad521984 (diff)
downloadblackbird-obmc-linux-978ef7e6d0e02083e4a62ab4411922bdeffa36a4.tar.gz
blackbird-obmc-linux-978ef7e6d0e02083e4a62ab4411922bdeffa36a4.zip
m68k/amiga: Convert Amiga to genirq
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/m68k/amiga/amiints.c3
2 files changed, 3 insertions, 1 deletions
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>
OpenPOWER on IntegriCloud