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 branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
atomic.h
diff --git
a/arch/m68k/include/asm/atomic.h
b/arch/m68k/include/asm/atomic.h
index
8d29145
..
eab36dc
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>