aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-07-13 15:48:30 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:50 -0500
commitddc7fd25d09678f8252c0321ef4b66e8451abe7d (patch)
treee95db89cd1801787baa2c0cc1dad2f1de64d0f49 /arch/m68k
parentfb1b646aa3bcae2f8211136a6b40228c7c9d236c (diff)
m68k/mac: Convert Mac to genirq
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/m68k/mac/baboon.c3
-rw-r--r--arch/m68k/mac/oss.c3
-rw-r--r--arch/m68k/mac/psc.c3
-rw-r--r--arch/m68k/mac/via.c3
5 files changed, 12 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 9000921385aa..9ba1a89e0032 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -87,7 +87,6 @@ config MMU_SUN3
87config USE_GENERIC_HARDIRQS 87config USE_GENERIC_HARDIRQS
88 bool "Use genirq" 88 bool "Use genirq"
89 depends on MMU 89 depends on MMU
90 depends on !MAC
91 depends on !APOLLO 90 depends on !APOLLO
92 depends on !MVME147 91 depends on !MVME147
93 depends on !MVME16x 92 depends on !MVME16x
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index f264791b8694..ff11746b0621 100644
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -11,6 +11,9 @@
11#include <linux/mm.h> 11#include <linux/mm.h>
12#include <linux/delay.h> 12#include <linux/delay.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#ifdef CONFIG_GENERIC_HARDIRQS
15#include <linux/irq.h>
16#endif
14 17
15#include <asm/traps.h> 18#include <asm/traps.h>
16#include <asm/bootinfo.h> 19#include <asm/bootinfo.h>
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 1eb60f071007..ed952704e6ee 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -19,6 +19,9 @@
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/delay.h> 20#include <linux/delay.h>
21#include <linux/init.h> 21#include <linux/init.h>
22#ifdef CONFIG_GENERIC_HARDIRQS
23#include <linux/irq.h>
24#endif
22 25
23#include <asm/bootinfo.h> 26#include <asm/bootinfo.h>
24#include <asm/macintosh.h> 27#include <asm/macintosh.h>
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index 26c2b6595808..0a34b7afc376 100644
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -18,6 +18,9 @@
18#include <linux/mm.h> 18#include <linux/mm.h>
19#include <linux/delay.h> 19#include <linux/delay.h>
20#include <linux/init.h> 20#include <linux/init.h>
21#ifdef CONFIG_GENERIC_HARDIRQS
22#include <linux/irq.h>
23#endif
21 24
22#include <asm/traps.h> 25#include <asm/traps.h>
23#include <asm/bootinfo.h> 26#include <asm/bootinfo.h>
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index af9ed33bec14..bde156caa46d 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -28,6 +28,9 @@
28#include <linux/delay.h> 28#include <linux/delay.h>
29#include <linux/init.h> 29#include <linux/init.h>
30#include <linux/module.h> 30#include <linux/module.h>
31#ifdef CONFIG_GENERIC_HARDIRQS
32#include <linux/irq.h>
33#endif
31 34
32#include <asm/bootinfo.h> 35#include <asm/bootinfo.h>
33#include <asm/macintosh.h> 36#include <asm/macintosh.h>