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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
include
/
asm
/
atomic.h
diff --git
a/arch/m68k/include/asm/atomic.h
b/arch/m68k/include/asm/atomic.h
index 8d29145ebb27b66b6402c0c04367032c15d1e35c..eab36dcacf6c427241b64e969343f23649ccd11a 100644
(file)
--- a/
arch/m68k/include/asm/atomic.h
+++ b/
arch/m68k/include/asm/atomic.h
@@
-3,3
+3,5
@@
#else
#include "atomic_mm.h"
#endif
+
+#include <asm-generic/atomic64.h>