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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
atomic.h
diff --git
a/arch/sh/include/asm/atomic.h
b/arch/sh/include/asm/atomic.h
index
157c320
..
e8e7813
100644
(file)
--- a/
arch/sh/include/asm/atomic.h
+++ b/
arch/sh/include/asm/atomic.h
@@
-85,4
+85,6
@@
static inline int atomic_add_unless(atomic_t *v, int a, int u)
#define smp_mb__after_atomic_inc() barrier()
#include <asm-generic/atomic-long.h>
+#include <asm-generic/atomic64.h>
+
#endif /* __ASM_SH_ATOMIC_H */