From 74d46a447e8daa1f945532500375da4a6f648dd2 Mon Sep 17 00:00:00 2001
From: Philippe De Muyter <phdm@macqel.be>
Date: Thu, 28 Oct 2010 14:42:58 +0200
Subject: [PATCH] --- yaml --- r: 221568 b: refs/heads/master c:
 ed35f654e4f0e08d39036353cc1dfda52a5cf129 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/m68k/include/asm/irqflags.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 827b8698a0dd..e64d91bd3239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79c1a903ecddc52a7ecbac1e8e73f360ac6d0472
+refs/heads/master: ed35f654e4f0e08d39036353cc1dfda52a5cf129
diff --git a/trunk/arch/m68k/include/asm/irqflags.h b/trunk/arch/m68k/include/asm/irqflags.h
index 4a5b284a1550..7ef4115b8c4a 100644
--- a/trunk/arch/m68k/include/asm/irqflags.h
+++ b/trunk/arch/m68k/include/asm/irqflags.h
@@ -2,7 +2,9 @@
 #define _M68K_IRQFLAGS_H
 
 #include <linux/types.h>
+#ifdef CONFIG_MMU
 #include <linux/hardirq.h>
+#endif
 #include <linux/preempt.h>
 #include <asm/thread_info.h>
 #include <asm/entry.h>