From 44b508fb210657647452a57c472eacd6a5329ca2 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 4 Feb 2008 22:30:02 -0800
Subject: [PATCH] --- yaml --- r: 83127 b: refs/heads/master c:
 26a6e661b118b95422ccfcd10c9997db5967df58 h: refs/heads/master i:   83125:
 335be6bc16f663977b530d2926c016d3dce3a717   83123:
 bc9c8a280970255d8f4bcac3b66760ea2e7d9a6f   83119:
 30a1adc7cf6fbef5c454357e9088d0c59b38ae1e v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-alpha/atomic.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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();