diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-31 16:08:28 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 16:35:50 -0500 |
| commit | 978ef7e6d0e02083e4a62ab4411922bdeffa36a4 (patch) | |
| tree | 71d6caf424e5e6fc26293673e2c80afbde85732f | |
| parent | 92b1bd5f1aa88ce4760c02814bfcbb58ad521984 (diff) | |
m68k/amiga: Convert Amiga to genirq
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
| -rw-r--r-- | arch/m68k/amiga/amiints.c | 3 |
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 | |||
| 87 | config USE_GENERIC_HARDIRQS | 87 | config USE_GENERIC_HARDIRQS |
| 88 | bool "Use genirq" | 88 | bool "Use genirq" |
| 89 | depends on MMU | 89 | depends on MMU |
| 90 | depends on !AMIGA | ||
| 91 | depends on !MAC | 90 | depends on !MAC |
| 92 | depends on !APOLLO | 91 | depends on !APOLLO |
| 93 | depends on !MVME147 | 92 | 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 @@ | |||
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/interrupt.h> | 10 | #include <linux/interrupt.h> |
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 12 | #ifdef CONFIG_GENERIC_HARDIRQS | ||
| 13 | #include <linux/irq.h> | ||
| 14 | #endif | ||
| 12 | 15 | ||
| 13 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
| 14 | #include <asm/traps.h> | 17 | #include <asm/traps.h> |