diff --git a/[refs] b/[refs]
index 14b622d9658b..52664dde550c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e820ce72d3aaadb8b53455cbdf213d3439f6c280
+refs/heads/master: 26a6e661b118b95422ccfcd10c9997db5967df58
diff --git a/trunk/include/asm-alpha/atomic.h b/trunk/include/asm-alpha/atomic.h
index f5cb7b878af2..ca88e54dec93 100644
--- a/trunk/include/asm-alpha/atomic.h
+++ b/trunk/include/asm-alpha/atomic.h
@@ -100,7 +100,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
 /*
  * Same as above, but return the result value
  */
-static __inline__ long atomic_add_return(int i, atomic_t * v)
+static inline int atomic_add_return(int i, atomic_t *v)
 {
 	long temp, result;
 	smp_mb();