Merge mulgrave-w:git/scsi-misc-2.6

[pandora-kernel.git] / include / asm-arm / spinlock.h

diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h
index e2f1d75..01b7c26 100644 (file)
--- a/include/asm-arm/spinlock.h
+++ b/include/asm-arm/spinlock.h
@@ -201,7 +201,7 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
 
 static inline int __raw_read_trylock(raw_rwlock_t *rw)
 {
-       unsigned long tmp tmp2 = 1;
+       unsigned long tmp, tmp2 = 1;
 
        __asm__ __volatile__(
 "1:    ldrex   %0, [%2]\n"