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 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
atomic_32.h
diff --git
a/arch/sparc/include/asm/atomic_32.h
b/arch/sparc/include/asm/atomic_32.h
index
bb91b12
..
f0d343c
100644
(file)
--- a/
arch/sparc/include/asm/atomic_32.h
+++ b/
arch/sparc/include/asm/atomic_32.h
@@
-161,5
+161,5
@@
static inline int __atomic24_sub(int i, atomic24_t *v)
#endif /* !(__KERNEL__) */
-#include <asm-generic/atomic.h>
+#include <asm-generic/atomic
-long
.h>
#endif /* !(__ARCH_SPARC_ATOMIC__) */