git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.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
a6a4b35
..
2503d4e
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 */