diff --git a/[refs] b/[refs]
index 8a794d39af82..78c45a25066a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 390bd132b2831a2ad0268e84bffbfc0680debfe5
+refs/heads/master: 18282b36d742347abd9a4bc74fe9fd2432a8335b
diff --git a/trunk/arch/ia64/include/asm/fpu.h b/trunk/arch/ia64/include/asm/fpu.h
index 0c26157cffa5..b6395ad1500a 100644
--- a/trunk/arch/ia64/include/asm/fpu.h
+++ b/trunk/arch/ia64/include/asm/fpu.h
@@ -6,6 +6,8 @@
  *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
+#include <linux/types.h>
+
 /* floating point status register: */
 #define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */
 #define FPSR_TRAP_DD	(1 << 1)	/* denormal trap disabled */