projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perfcounters/core
[linux-2.6]
/
arch
/
ia64
/
include
/
asm
/
atomic.h
diff --git
a/arch/ia64/include/asm/atomic.h
b/arch/ia64/include/asm/atomic.h
index
d37292b
..
88405cb
100644
(file)
--- a/
arch/ia64/include/asm/atomic.h
+++ b/
arch/ia64/include/asm/atomic.h
@@
-216,5
+216,5
@@
atomic64_add_negative (__s64 i, atomic64_t *v)
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic
-long
.h>
#endif /* _ASM_IA64_ATOMIC_H */