git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
asm-generic: rename atomic.h to atomic-long.h
[sfrench/cifs-2.6.git]
/
arch
/
xtensa
/
include
/
asm
/
atomic.h
diff --git
a/arch/xtensa/include/asm/atomic.h
b/arch/xtensa/include/asm/atomic.h
index 67ad67bed8c14abb1c3daac72a0106d80e31c9af..22d6dde426192266c3915403f8a73785fef6f916 100644
(file)
--- a/
arch/xtensa/include/asm/atomic.h
+++ b/
arch/xtensa/include/asm/atomic.h
@@
-292,7
+292,7
@@
static inline void atomic_set_mask(unsigned int mask, atomic_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 /* __KERNEL__ */
#endif /* _XTENSA_ATOMIC_H */