From 5c7607558d4e16522e83fb00813b1a6fd21b64c8 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Fri, 14 Oct 2011 14:22:22 +1000
Subject: [PATCH] --- yaml --- r: 279719 b: refs/heads/master c:
 78ccdffc937319f4f7ffc13684c114100c727c21 h: refs/heads/master i:   279717:
 ac020003adf8247f1d8a905dbc7f871abac9bd81   279715:
 cd5544e0e6f5b6399133dee3c673ba9b35acc2c7   279711:
 8f40cefd3585f15e9b6e54305bb7ad22a23aad7a v: v3

---
 [refs]                            | 2 +-
 trunk/arch/m68k/include/asm/irq.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cea9d3ac5be3..e2f8932a540b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cee26f82a0c830740db0267f828045cc39b90b9
+refs/heads/master: 78ccdffc937319f4f7ffc13684c114100c727c21
diff --git a/trunk/arch/m68k/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq.h
index 6198df5ff245..0e89fa05de0e 100644
--- a/trunk/arch/m68k/include/asm/irq.h
+++ b/trunk/arch/m68k/include/asm/irq.h
@@ -25,7 +25,8 @@
 #define NR_IRQS	0
 #endif
 
-#ifdef CONFIG_MMU
+#if defined(CONFIG_M68020) || defined(CONFIG_M68030) || \
+    defined(CONFIG_M68040) || defined(CONFIG_M68060)
 
 /*
  * Interrupt source definitions
@@ -80,7 +81,7 @@ extern unsigned int irq_canonicalize(unsigned int irq);
 
 #else
 #define irq_canonicalize(irq)  (irq)
-#endif /* CONFIG_MMU */
+#endif /* !(CONFIG_M68020 || CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */
 
 asmlinkage void do_IRQ(int irq, struct pt_regs *regs);
 extern atomic_t irq_err_count;