diff --git a/[refs] b/[refs]
index 47514ac9f8e8..b81df7b95cef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2
+refs/heads/master: 80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8
diff --git a/trunk/include/asm-generic/cmpxchg.h b/trunk/include/asm-generic/cmpxchg.h
index 8a361834dc25..14883026015d 100644
--- a/trunk/include/asm-generic/cmpxchg.h
+++ b/trunk/include/asm-generic/cmpxchg.h
@@ -10,6 +10,7 @@
 #error "Cannot use generic cmpxchg on SMP"
 #endif
 
+#include <linux/types.h>
 #include <linux/irqflags.h>
 
 #ifndef xchg