diff --git a/[refs] b/[refs]
index 8e56f2b041d7..d97347e483b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 295803eea178d777cf3813b16696c54b0b2bcd23
+refs/heads/master: fa9ea6c7abd94482ecd84e130676b6a1b3e61c2c
diff --git a/trunk/arch/ia64/include/asm/fpu.h b/trunk/arch/ia64/include/asm/fpu.h
index 3859558ff0a4..b6395ad1500a 100644
--- a/trunk/arch/ia64/include/asm/fpu.h
+++ b/trunk/arch/ia64/include/asm/fpu.h
@@ -6,7 +6,7 @@
  *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 /* floating point status register: */
 #define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */