diff --git a/[refs] b/[refs]
index f93d43abdeac..19b6940f2886 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05e4396651ca1cac51d8da9ff4992741c9dc1e39
+refs/heads/master: 4f8b5c70967de5fd27f2092f1f8da47f4705bb67
diff --git a/trunk/include/asm-mips/atomic.h b/trunk/include/asm-mips/atomic.h
index 7978d8e11647..365767074c79 100644
--- a/trunk/include/asm-mips/atomic.h
+++ b/trunk/include/asm-mips/atomic.h
@@ -375,7 +375,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
 
 #ifdef CONFIG_64BIT
 
-typedef struct { volatile __s64 counter; } atomic64_t;
+typedef struct { volatile long counter; } atomic64_t;
 
 #define ATOMIC64_INIT(i)    { (i) }