[PATCH 17/28] m68k/amiga: Convert Amiga to genirq

Geert Uytterhoeven
2011-09-11T11:59:43Z

v3: With handle_simple_irq(), we don't need the .irq_{,un}mask methods anymore.
With m68k_handle_int() renamed to generic_handle_irq(), code paths for
legacy and genirq become the same.

v2: Added this changeset
---
arch/m68k/Kconfig.mmu | 1 -
arch/m68k/amiga/amiints.c | 3 +++
2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/Kconfig.mmu b/arch/m68k/Kconfig.mmu
index 2df049f..20e27d1 100644
--- a/arch/m68k/Kconfig.mmu
+++ b/arch/m68k/Kconfig.mmu
@@ -200,7 +200,6 @@ config SUN3

config USE_GENERIC_HARDIRQS
bool "Use genirq"
- 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 c8f9eac..c3da534 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>
--
1.7.0.4