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
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
bitops-grb.h
diff --git
a/arch/sh/include/asm/bitops-grb.h
b/arch/sh/include/asm/bitops-grb.h
index
a5907b9
..
e73af33
100644
(file)
--- a/
arch/sh/include/asm/bitops-grb.h
+++ b/
arch/sh/include/asm/bitops-grb.h
@@
-166,4
+166,7
@@
static inline int test_and_change_bit(int nr, volatile void * addr)
return retval;
}
+
+#include <asm-generic/bitops/non-atomic.h>
+
#endif /* __ASM_SH_BITOPS_GRB_H */