diff --git a/[refs] b/[refs]
index aebcdb12adde..9db96fab84b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cebbd3fb803603b12408458ba17c29ce1e15a5f2
+refs/heads/master: f16695f4ac088cf7593e113574046d2d7e5af5eb
diff --git a/trunk/include/asm-generic/int-ll64.h b/trunk/include/asm-generic/int-ll64.h
index 260948905e4e..f9bc9ac29b36 100644
--- a/trunk/include/asm-generic/int-ll64.h
+++ b/trunk/include/asm-generic/int-ll64.h
@@ -26,7 +26,7 @@ typedef unsigned int __u32;
 #ifdef __GNUC__
 __extension__ typedef __signed__ long long __s64;
 __extension__ typedef unsigned long long __u64;
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#else
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 #endif