diff --git a/[refs] b/[refs]
index 8d526cdc2fa8..0af54417862d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b9ed1a5d2d121f32d2cb4f2b05f1fc57c99c946
+refs/heads/master: a54baa1487c51c8306dd6f457c1b5d5fcd539fff
diff --git a/trunk/include/asm-generic/bitops/fls64.h b/trunk/include/asm-generic/bitops/fls64.h
index 716c51e0dd4c..1b6b17ce2428 100644
--- a/trunk/include/asm-generic/bitops/fls64.h
+++ b/trunk/include/asm-generic/bitops/fls64.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_GENERIC_BITOPS_FLS64_H_
 #define _ASM_GENERIC_BITOPS_FLS64_H_
 
+#include <asm/types.h>
+
 static inline int fls64(__u64 x)
 {
 	__u32 h = x >> 32;
diff --git a/trunk/include/asm-generic/bitops/hweight.h b/trunk/include/asm-generic/bitops/hweight.h
index 8be6f17d6a5c..fbbc383771da 100644
--- a/trunk/include/asm-generic/bitops/hweight.h
+++ b/trunk/include/asm-generic/bitops/hweight.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_HWEIGHT_H_
 
+#include <asm/types.h>
+
 extern unsigned int hweight32(unsigned int w);
 extern unsigned int hweight16(unsigned int w);
 extern unsigned int hweight8(unsigned int w);