diff --git a/[refs] b/[refs]
index f28ca33eb17c..a5b7ce3e989e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1df1a4cbcd33cf66111293c654dcff0199d965f0
+refs/heads/master: b31d42a5af1818bdf31a5f023abe4d8b212542f2
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 6ed7ace74b7c..1c73b50e81ff 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -9,6 +9,7 @@
 #include <linux/limits.h>
 #include <linux/ioctl.h>
 #include <linux/blk_types.h>
+#include <linux/types.h>
 
 /*
  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change