---

yaml --- r: 275388 b: refs/heads/master c: 978ef7e h: refs/heads/master v: v3
git-mirror · Nov 8, 2011 · f9c37f2 · f9c37f2
1 parent a86d372
commit f9c37f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b1bd5f1aa88ce4760c02814bfcbb58ad521984
+refs/heads/master: 978ef7e6d0e02083e4a62ab4411922bdeffa36a4
diff --git 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 !AMIGA
 	depends on !MAC
 	depends on !APOLLO
 	depends on !MVME147

diff --git a/trunk/arch/m68k/amiga/amiints.c b/trunk/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>