projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmaengine' into async-tx-next
[cascardo/linux.git]
/
arch
/
m32r
/
include
/
asm
/
atomic.h
diff --git
a/arch/m32r/include/asm/atomic.h
b/arch/m32r/include/asm/atomic.h
index
2eed30f
..
63f0cf0
100644
(file)
--- a/
arch/m32r/include/asm/atomic.h
+++ b/
arch/m32r/include/asm/atomic.h
@@
-314,5
+314,5
@@
static __inline__ void atomic_set_mask(unsigned long mask, atomic_t *addr)
#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_M32R_ATOMIC_H */