From bd522cfd7299c93fe388dde7c0728fbce319aa0d Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 13 Jul 2011 21:48:30 +0200
Subject: [PATCH] --- yaml --- r: 275390 b: refs/heads/master c:
 ddc7fd25d09678f8252c0321ef4b66e8451abe7d h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/m68k/Kconfig      | 1 -
 trunk/arch/m68k/mac/baboon.c | 3 +++
 trunk/arch/m68k/mac/oss.c    | 3 +++
 trunk/arch/m68k/mac/psc.c    | 3 +++
 trunk/arch/m68k/mac/via.c    | 3 +++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 611618c78bd2..8d9fb9f49a13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb1b646aa3bcae2f8211136a6b40228c7c9d236c
+refs/heads/master: ddc7fd25d09678f8252c0321ef4b66e8451abe7d
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
index 9000921385aa..9ba1a89e0032 100644
--- a/trunk/arch/m68k/Kconfig
+++ b/trunk/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/trunk/arch/m68k/mac/baboon.c b/trunk/arch/m68k/mac/baboon.c
index f264791b8694..ff11746b0621 100644
--- a/trunk/arch/m68k/mac/baboon.c
+++ b/trunk/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/trunk/arch/m68k/mac/oss.c b/trunk/arch/m68k/mac/oss.c
index 1eb60f071007..ed952704e6ee 100644
--- a/trunk/arch/m68k/mac/oss.c
+++ b/trunk/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/trunk/arch/m68k/mac/psc.c b/trunk/arch/m68k/mac/psc.c
index 26c2b6595808..0a34b7afc376 100644
--- a/trunk/arch/m68k/mac/psc.c
+++ b/trunk/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/trunk/arch/m68k/mac/via.c b/trunk/arch/m68k/mac/via.c
index af9ed33bec14..bde156caa46d 100644
--- a/trunk/arch/m68k/mac/via.c
+++ b/trunk/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>