Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / asm-frv / futex.h

diff --git a/include/asm-frv/futex.h b/include/asm-frv/futex.h
index 9a0e9026ba5ea5c4abc2f449e1441c1fa6b1fbfe..08b3d1da358398e111ccf01f50227ef8f60a7ffc 100644 (file)
--- a/include/asm-frv/futex.h
+++ b/include/asm-frv/futex.h
@@ -10,7 +10,7 @@
 extern int futex_atomic_op_inuser(int encoded_op, int __user *uaddr);
 
 static inline int
-futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval)
+futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
 {
        return -ENOSYS;
 }