From befc4ebbe3cbf712c6c00b2582784e9f61086c47 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@ksplice.com>
Date: Wed, 16 Sep 2009 12:44:25 -0400
Subject: [PATCH] --- yaml --- r: 172681 b: refs/heads/master c:
 5cdef24b2ab44ca587d46d212468b0cfb5b83a59 h: refs/heads/master i:   172679:
 0cf5e59f8301c2ed32d17a1bb9bc0931c7bd4db8 v: v3

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

diff --git a/[refs] b/[refs]
index c6d371b75295..5acd106be49d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f60a5572679ef8508b62bd82063b05ffbe838716
+refs/heads/master: 5cdef24b2ab44ca587d46d212468b0cfb5b83a59
diff --git a/trunk/arch/m68k/include/asm/thread_info_mm.h b/trunk/arch/m68k/include/asm/thread_info_mm.h
index b6da3882be9b..167e518db41b 100644
--- a/trunk/arch/m68k/include/asm/thread_info_mm.h
+++ b/trunk/arch/m68k/include/asm/thread_info_mm.h
@@ -4,10 +4,12 @@
 #ifndef ASM_OFFSETS_C
 #include <asm/asm-offsets.h>
 #endif
-#include <asm/current.h>
 #include <asm/types.h>
 #include <asm/page.h>
 
+#ifndef __ASSEMBLY__
+#include <asm/current.h>
+
 struct thread_info {
 	struct task_struct	*task;		/* main task structure */
 	unsigned long		flags;
@@ -16,6 +18,7 @@ struct thread_info {
 	__u32 cpu; /* should always be 0 on m68k */
 	struct restart_block    restart_block;
 };
+#endif /* __ASSEMBLY__ */
 
 #define PREEMPT_ACTIVE		0x4000000