Merge branch 'linus' into x86/urgent

[karo-tx-linux.git] / arch / x86 / include / asm / atomic_32.h

diff --git a/arch/x86/include/asm/atomic_32.h b/arch/x86/include/asm/atomic_32.h
index a6a4b357076d92056e9a4071210fff75878ee22e..2503d4e64c2a79a2aab7618e9c325aadb428e74d 100644 (file)
--- a/arch/x86/include/asm/atomic_32.h
+++ b/arch/x86/include/asm/atomic_32.h
@@ -482,5 +482,5 @@ atomic64_add_negative(unsigned long long delta, atomic64_t *ptr)
        return old_val < 0;
 }
 
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic-long.h>
 #endif /* _ASM_X86_ATOMIC_32_H */