Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux

[linux-beck.git] / arch / m68k / include / asm / entry_mm.h

diff --git a/arch/m68k/include/asm/entry_mm.h b/arch/m68k/include/asm/entry_mm.h
index 47412588621839d963e0b2e2cb1ef772a49a5990..e41fea399bfe1c94c03e4a0fcab662ee7a67fbcf 100644 (file)
--- a/arch/m68k/include/asm/entry_mm.h
+++ b/arch/m68k/include/asm/entry_mm.h
@@ -3,6 +3,9 @@
 
 #include <asm/setup.h>
 #include <asm/page.h>
+#ifdef __ASSEMBLY__
+#include <asm/thread_info.h>
+#endif
 
 /*
  * Stack layout in 'ret_from_exception':