asm-generic: merge branch 'master' of torvalds/linux-2.6

[~andy/linux] / 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 aff9f1fcdcd7e2be9d86049fc7f9522bafd4b35d..8cb9c814e1203a0b7434018392e2ee01ef3ca199 100644 (file)
--- a/arch/x86/include/asm/atomic_32.h
+++ b/arch/x86/include/asm/atomic_32.h
@@ -483,5 +483,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 */