diff --git a/[refs] b/[refs]
index df1a1e25a65b..f777870b5bbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48a46752a9a43c9bd106cc9798ee511feef5b7e6
+refs/heads/master: 40380f1c7841a5dcbf0b20f0b6da11969211ef77
diff --git a/trunk/arch/ia64/include/asm/cmpxchg.h b/trunk/arch/ia64/include/asm/cmpxchg.h
index 507c66c77600..4c96187e2049 100644
--- a/trunk/arch/ia64/include/asm/cmpxchg.h
+++ b/trunk/arch/ia64/include/asm/cmpxchg.h
@@ -1 +1 @@
-/* Future home of xchg() and cmpxchg() */
+#include <asm/intrinsics.h>