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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
atomic_no.h
diff --git
a/arch/m68k/include/asm/atomic_no.h
b/arch/m68k/include/asm/atomic_no.h
index
6bb6748
..
5674cb9
100644
(file)
--- a/
arch/m68k/include/asm/atomic_no.h
+++ b/
arch/m68k/include/asm/atomic_no.h
@@
-151,5
+151,5
@@
static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
#define atomic_dec_return(v) atomic_sub_return(1,(v))
#define atomic_inc_return(v) atomic_add_return(1,(v))
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic
-long
.h>
#endif /* __ARCH_M68KNOMMU_ATOMIC __ */