m68k/mac: Convert Mac to genirq

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 9000921385aa00546c480263fc7d13adc7b6bf37..9ba1a89e0032ca94ae07e9597122c5211a18fd54 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 !MAC
        depends on !APOLLO
        depends on !MVME147
        depends on !MVME16x

diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index f264791b86942b1fc2ad82140580d8668541a7ae..ff11746b0621f87e492b40c8a8fe1ed3fe011f68 100644 (file)
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -11,6 +11,9 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#endif
 
 #include <asm/traps.h>
 #include <asm/bootinfo.h>

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 1eb60f071007836eedae38304af9067a4b3e6b15..ed952704e6eec9c4e94ad39c2e8a111b7739f681 100644 (file)
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -19,6 +19,9 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#endif
 
 #include <asm/bootinfo.h>
 #include <asm/macintosh.h>

diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index 26c2b659580881ab4459a9b0a43c662b40d43add..0a34b7afc376450fbe94865f0535798814858d55 100644 (file)
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -18,6 +18,9 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#endif
 
 #include <asm/traps.h>
 #include <asm/bootinfo.h>

diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index af9ed33bec14336e316973587b4f9cb3fa5db5c5..bde156caa46d0c1715159101029593cb4b800108 100644 (file)
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -28,6 +28,9 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#ifdef CONFIG_GENERIC_HARDIRQS
+#include <linux/irq.h>
+#endif
 
 #include <asm/bootinfo.h>
 #include <asm/macintosh.h>