Merge branch 'master' into tk71

[mv-sheeva.git] / arch / cris / include / asm / system.h

diff --git a/arch/cris/include/asm/system.h b/arch/cris/include/asm/system.h
index 8657b084a922e3ff0cb5187130961ada08262cee..ea10592f7d75ccab1a4512b9e4f4f9c79da4cd3d 100644 (file)
--- a/arch/cris/include/asm/system.h
+++ b/arch/cris/include/asm/system.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_CRIS_SYSTEM_H
 #define __ASM_CRIS_SYSTEM_H
 
+#include <linux/irqflags.h>
 #include <arch/system.h>
 
 /* the switch_to macro calls resume, an asm function in entry.S which does the actual